diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 3872dd4368a..c6f8aff617d 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -244,13 +244,23 @@
sealing = 1
if(!seal_target && !suit_is_deployed())
- wearer.visible_message("[wearer]'s suit flashes an error light.","Your suit flashes an error light. It can't function properly without being fully deployed.")
+ wearer.visible_message(
+ SPAN_DANGER("[wearer]'s suit flashes an error light."),
+ SPAN_DANGER("Your suit flashes an error light. It can't function properly without being fully deployed.")
+ )
playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE)
failed_to_seal = 1
var/is_in_cycler = istype(initiator.loc, /obj/machinery/suit_cycler)
seal_delay = is_in_cycler ? 1 : initial(seal_delay)
+ var/jumpsuit_was_hidden = FALSE
+ if(suit_is_deployed() && (wearer.wear_suit.flags_inv & HIDEJUMPSUIT) && !instant)
+ /// Don't hide the jumpsuit while removing the rig.
+ wearer.wear_suit.flags_inv &= ~HIDEJUMPSUIT
+ wearer.update_inv_wear_suit()
+ jumpsuit_was_hidden = TRUE
+
if(!failed_to_seal)
if(!instant)
wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.")
@@ -262,7 +272,11 @@
if(!wearer)
failed_to_seal = 1
else
- for(var/list/piece_data in list(list(wearer.shoes,boots,"boots",boot_type),list(wearer.gloves,gloves,"gloves",glove_type),list(wearer.head,helmet,"helmet",helm_type),list(wearer.wear_suit,chest,BP_CHEST,chest_type)))
+ for(var/list/piece_data in list(
+ list(wearer.shoes, boots, "boots", boot_type),
+ list(wearer.gloves, gloves, "gloves", glove_type),
+ list(wearer.head, helmet, "helmet", helm_type),
+ list(wearer.wear_suit, chest, "chest", chest_type)))
var/obj/item/clothing/piece = piece_data[1]
var/obj/item/compare_piece = piece_data[2]
@@ -292,8 +306,12 @@
if("gloves")
to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].")
wearer.update_inv_gloves()
- if(BP_CHEST)
- to_chat(wearer, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].")
+ if("chest")
+ to_chat(wearer, "\The [piece] [!seal_target ? "cinches your chest tightly" : "releases your chest"].")
+ if(!seal_target)
+ piece.flags_inv |= HIDEJUMPSUIT
+ else
+ piece.flags_inv &= ~HIDEJUMPSUIT
wearer.update_inv_wear_suit()
if("helmet")
to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].")
@@ -317,11 +335,14 @@
if(failed_to_seal)
for(var/obj/item/piece in list(helmet,boots,gloves,chest))
- if(!piece) continue
+ if(!piece)
+ continue
piece.icon_state = "[initial(icon_state)][!seal_target ? "" : "_sealed"]"
canremove = !seal_target
if(airtight)
update_component_sealed()
+ if(jumpsuit_was_hidden && wearer.wear_suit == chest)
+ wearer.wear_suit.flags_inv |= HIDEJUMPSUIT
update_icon(1)
return 0
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 5c050d0fc55..c174b2bf38a 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -40,7 +40,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT|HIDETAIL
+ flags_inv = HIDETAIL
item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT
slowdown = 0
//will reach 10 breach damage after 25 laser carbine blasts, 3 revolver hits, or ~1 PTR hit. Completely immune to smg or sts hits.
@@ -52,19 +52,6 @@
supporting_limbs = list()
-/obj/item/clothing/suit/space/rig/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
- var/obj/item/clothing/w_uniform = H.w_uniform
- var/image/uniform = null
-
- if(w_uniform)
- uniform = w_uniform.return_own_image()
- var/image/I = ..()
- if(uniform)
- uniform.add_overlay(I)
- return uniform
- else
- return I
-
//TODO: move this to modules
/obj/item/clothing/head/helmet/space/rig/proc/prevent_track()
return 0
@@ -104,7 +91,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
item_flags = THICKMATERIAL|INJECTIONPORT
/obj/item/clothing/shoes/lightrig
diff --git a/html/changelogs/mattatlas-hollow.yml b/html/changelogs/mattatlas-hollow.yml
new file mode 100644
index 00000000000..9991103f796
--- /dev/null
+++ b/html/changelogs/mattatlas-hollow.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixes suits awkwardly showing up on top of rig pieces. They should now properly layer under them."