Skip to content

Commit

Permalink
all del hardsuits
Browse files Browse the repository at this point in the history
  • Loading branch information
Artemchik542 committed Jul 19, 2024
1 parent 3ca85af commit 02939af
Show file tree
Hide file tree
Showing 24 changed files with 2 additions and 1,831 deletions.
30 changes: 2 additions & 28 deletions code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,6 @@
mod = new mod_type(src)
if(storage_type)
storage = new storage_type(src)
//MASSMETA EDIT ADDITION BEGIN (hardsuits)
if(space_suit_type)
space_suit = new space_suit_type(src)
//MASSMETA EDIT ADDITION END
update_appearance()

register_context()
Expand All @@ -207,7 +203,6 @@
QDEL_NULL(mask)
QDEL_NULL(mod)
QDEL_NULL(storage)
QDEL_NULL(space_suit) //MASSMETA EDIT ADDITION (hardsuits)
id_card = null
return ..()

Expand Down Expand Up @@ -240,16 +235,12 @@
. += "[base_icon_state]_panel"
if(state_open)
. += "[base_icon_state]_open"
if(suit || mod || space_suit) //MASSMETA EDIT CHANGE (hardsuits) - ORIGINAL: if(suit || mod)
if(suit || mod)
. += "[base_icon_state]_suit"
if(helmet)
. += "[base_icon_state]_helm"
if(storage)
. += "[base_icon_state]_storage"
//MASSMETA EDIT ADDITION BEGIN (hardsuits)
if(space_suit)
. += "[base_icon_state]_space_suit"
//MASSMETA EDIT ADDITION END
if(!(machine_stat & BROKEN || machine_stat & NOPOWER))
if(state_open)
. += "[base_icon_state]_lights_open"
Expand Down Expand Up @@ -316,7 +307,6 @@
mask = null
mod = null
storage = null
space_suit = null //MASSMETA EDIT ADDITION (hardsuits)
set_occupant(null)

/obj/machinery/suit_storage_unit/on_deconstruction(disassembled)
Expand Down Expand Up @@ -354,7 +344,6 @@
"mask" = create_silhouette_of(/obj/item/clothing/mask/breath),
"mod" = create_silhouette_of(/obj/item/mod/control),
"storage" = create_silhouette_of(/obj/item/tank/internals/oxygen),
"space_suit" = create_silhouette_of(/obj/item/choice_beacon/space_suit), //MASSMETA EDIT ADDITION (hardsuits)
)

. = ..()
Expand Down Expand Up @@ -412,7 +401,7 @@
if (occupant && safeties)
say("Alert: safeties triggered, occupant detected!")
return
else if (!helmet && !mask && !suit && !storage && !occupant && !space_suit) //MASSMETA EDIT CHANGE (hardsuits) - ORIGINAL: else if (!helmet && !mask && !suit && !storage && !occupant)
else if (!helmet && !mask && !suit && !storage && !occupant)
to_chat(user, "There's nothing inside [src] to disinfect!")
return
else
Expand Down Expand Up @@ -526,7 +515,6 @@
QDEL_NULL(mask)
QDEL_NULL(mod)
QDEL_NULL(storage)
QDEL_NULL(space_suit) //MASSMETA EDIT ADDITION (hardsuits)
// The wires get damaged too.
wires.cut_all()
else
Expand All @@ -552,11 +540,6 @@
if(storage)
things_to_clear += storage
things_to_clear += storage.get_all_contents()
//MASSMETA EDIT ADDITION BEGIN (hardsuits)
if(space_suit)
things_to_clear += space_suit
things_to_clear += space_suit.get_all_contents()
//MASSMETA EDIT ADDITION END
if(mob_occupant)
things_to_clear += mob_occupant
things_to_clear += mob_occupant.get_all_contents()
Expand Down Expand Up @@ -775,15 +758,6 @@
if(!user.transferItemToLoc(weapon, src))
return
mod = weapon
//MASSMETA EDIT ADDITION BEGIN (hardsuits)
else if(istype(weapon, /obj/item/choice_beacon/space_suit))
if(space_suit)
to_chat(user, span_warning("The unit already contains a delivery beacon!"))
return
if(!user.transferItemToLoc(weapon, src))
return
space_suit = weapon
//MASSMETA EDIT ADDITION END
else
if(storage)
to_chat(user, span_warning("The auxiliary storage compartment is full!"))
Expand Down
9 changes: 0 additions & 9 deletions massmeta/code/modules/cargo/markets/market_items/clothing.dm

This file was deleted.

8 changes: 0 additions & 8 deletions massmeta/code/modules/jobs/job_types/clown.dm

This file was deleted.

256 changes: 0 additions & 256 deletions massmeta/features/hardsuits/code/armor.dm

This file was deleted.

Loading

0 comments on commit 02939af

Please sign in to comment.