From 3d9f1754cd6413f2efdd8407aab133dce3cc4729 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sat, 19 Jul 2014 23:02:26 -0400
Subject: [PATCH] Updates eng rig path, adds obj sprites

Adds object sprite sheets for tajaran, unathi and skrell hardsuits, where the icons were available (just engineering and syndie hardsuits for now).

Makes engineering hardsuits a subtype of the parent rig type, so it is
now possible to update eng hardsuits without affecting every other
hardsuit type.
---
 code/modules/awaymissions/corpse.dm          |   4 +-
 code/modules/clothing/spacesuits/rig.dm      |  55 ++++++++++++++++---
 icons/obj/clothing/species/skrell/hats.dmi   | Bin 0 -> 876 bytes
 icons/obj/clothing/species/skrell/suits.dmi  | Bin 0 -> 447 bytes
 icons/obj/clothing/species/tajaran/hats.dmi  | Bin 0 -> 2340 bytes
 icons/obj/clothing/species/tajaran/suits.dmi | Bin 0 -> 863 bytes
 icons/obj/clothing/species/unathi/hats.dmi   | Bin 0 -> 2013 bytes
 icons/obj/clothing/species/unathi/suits.dmi  | Bin 0 -> 452 bytes
 maps/tgstation2.dmm                          |  10 ++--
 9 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 icons/obj/clothing/species/skrell/hats.dmi
 create mode 100644 icons/obj/clothing/species/skrell/suits.dmi
 create mode 100644 icons/obj/clothing/species/tajaran/hats.dmi
 create mode 100644 icons/obj/clothing/species/tajaran/suits.dmi
 create mode 100644 icons/obj/clothing/species/unathi/hats.dmi
 create mode 100644 icons/obj/clothing/species/unathi/suits.dmi

diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index e9304976cce..b90fbe5b7f9 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -161,9 +161,9 @@
 	corpseidaccess = "Station Engineer"
 
 /obj/effect/landmark/corpse/engineer/rig
-	corpsesuit = /obj/item/clothing/suit/space/rig
+	corpsesuit = /obj/item/clothing/suit/space/rig/engineering
 	corpsemask = /obj/item/clothing/mask/breath
-	corpsehelmet = /obj/item/clothing/head/helmet/space/rig
+	corpsehelmet = /obj/item/clothing/head/helmet/space/rig/engineering
 
 /obj/effect/landmark/corpse/clown
 	name = "Clown"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 995e1167176..4009d1a8f8f 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -1,10 +1,10 @@
 //Regular rig suits
 /obj/item/clothing/head/helmet/space/rig
-	name = "engineering hardsuit helmet"
-	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
+	name = "hardsuit helmet"
+	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	icon_state = "rig0-engineering"
 	item_state = "eng_helm"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
 	allowed = list(/obj/item/device/flashlight)
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
@@ -49,13 +49,13 @@
 			SetLuminosity(brightness_on)
 
 /obj/item/clothing/suit/space/rig
-	name = "engineering hardsuit"
-	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
+	name = "hardsuit"
+	desc = "A special space suit for environments that might pose hazards beyond just the vacuum of space. Provides more protection than a standard space suit."
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
 	slowdown = 1
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 
@@ -292,21 +292,46 @@
 
 	..()
 
+//Engineering rig
+/obj/item/clothing/head/helmet/space/rig/engineering
+	name = "engineering hardsuit helmet"
+	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
+	icon_state = "rig0-engineering"
+	item_state = "eng_helm"
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
+	sprite_sheets_obj = list(
+		"Tajaran" = 'icons/obj/clothing/species/tajaran/hats.dmi',
+		)
+
+/obj/item/clothing/suit/space/rig/engineering
+	name = "engineering hardsuit"
+	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
+	icon_state = "rig-engineering"
+	item_state = "eng_hardsuit"
+	slowdown = 1
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	sprite_sheets_obj = list(
+		"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
+		)
+
 //Chief Engineer's rig
-/obj/item/clothing/head/helmet/space/rig/elite
+/obj/item/clothing/head/helmet/space/rig/engineering/chief
 	name = "advanced hardsuit helmet"
 	desc = "An advanced helmet designed for work in a hazardous, low pressure environment. Shines with a high polish."
 	icon_state = "rig0-white"
 	item_state = "ce_helm"
 	item_color = "white"
 	sprite_sheets = null
+	sprite_sheets_obj = null
 
-/obj/item/clothing/suit/space/rig/elite
+/obj/item/clothing/suit/space/rig/engineering/chief
 	icon_state = "rig-white"
 	name = "advanced hardsuit"
 	desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish."
 	item_state = "ce_hardsuit"
 	sprite_sheets = null
+	sprite_sheets_obj = null
 
 //Mining rig
 /obj/item/clothing/head/helmet/space/rig/mining
@@ -336,6 +361,13 @@
 	siemens_coefficient = 0.6
 	var/obj/machinery/camera/camera
 	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Vox")
+	sprite_sheets_obj = list(
+		"Tajaran" = 'icons/obj/clothing/species/tajaran/hats.dmi',
+		"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
+		"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
+		)
+
+
 /obj/item/clothing/head/helmet/space/rig/syndi/attack_self(mob/user)
 	if(camera)
 		..(user)
@@ -362,6 +394,11 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
 	siemens_coefficient = 0.6
 	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Vox")
+	sprite_sheets_obj = list(
+		"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
+		"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
+		"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
+		)
 
 
 //Wizard Rig
diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..10d3e059cfed2261ea25bef2f82d4c93e5a91c47
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq002M$001Be0{{R3l|zoU0002zP)t-sz`($6
zNli~dIbs6?e<v${C@X(8Fn>Tb*ElE9MJ&5_LvVUNZc0tZTQ;+ZO1OPSaf3p&9u9|g
zX@8ejl&Dmgm`s7$c{Cy<fd7DRRZwhQFn@4Jg2Q!ll1g^4S-t<gWETy8g;0>UTX?=;
zjQ@;|!C+N6JX%sjj{lCC!)150TZ{jTnZ#vSNkNakUwOo1ivNmtx?WdCKx2GUg1~fi
zqEU~$UXZ(8WPVg)1OuUPIDe{Mq^w)ADHDH9I<|sHnUF|#xLvN4P*ej0WD^UbYBYDH
zXQFL3R0IQLUon52Sz`|ge?2qiw0qkC0004WQchC<K<3zH0001VdQ@0+L}hbha%pgM
zX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS
zoZ^zil2jm5sVFnuK)1LuFC{ZoiHkEOv#1y-YRJWzR+N~V3SlFwH6)-`S;5uM1?&(2
zBvL5=^F%-70005ANkl<ZNQvE(X;Z>55QdxXHU_-92)0@k5v_`X_kE!OFZ}<%$4x=U
zF)7OMNtYSA>=WL+*-bs~ABD)tf6K=f@XZ&P`1~~z&q{zMAXfkaIUxf#Hzh!&Kq;f(
z6o8;moGcasC-;0I`2R*gp%4xMF(s#GX2aQ;X*uQK!bem{R3hRh`rq3m{6H4x%9Z&_
zd9Ek}i+fQd080QdKnX!ak;NAllcnXAcx8DhSzNHVCn7+I393LbXOZO~TCIigT7A8~
z5r?%^i}MaCLRGPVssg4C2b)Q_wcXfh>~4k0rprP4#X;(D&`iR(wYPuJVh2r!1CgfO
z17eL5rm3(Th{L1g_~bM`J2_6y4=v6s0J;A>1)c@>z~&e7^6HwWaD8<tFKlkEkr9Bt
zfRo?c-nH-B54Sf??rE)oNDu*MZr<s3AG=ST9Ig~;%s!-)y~6Nk`SSWApL02p<}0B2
zX|EXY-doSjc>%wNq)iZK4uRp^)7(Hpon^cOS^_`tzQul3=N@4Q&n$i}$T`9=o>?4>
zmoJ3-2*bG9f<B5o$I<!t0$kQsHVWsuBO8VP*?0#dIXkt1qC)oo0000<MNUMnLSTZ7
CB7`jf

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..9b88c784c464aeff1e935f0690a3f71a608c0af0
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000RP)t-sz`(#%
z0|R0M1GOFwe<v$6A|%&1CvHhiRXIG{X~?Aj0004WQchC<K<3zH0001PdQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5sVFmDx41GdB{Nlti!&v&s2C_{$i<mfl$e_eVJj=R`niD31_0P}
z90t8cRd)aY0N6=HK~yM_t&q!ZgD?<92@3n5O6?X6Hv2Yd)`$RW2YG6*1I-^;;s-|L
zvtz3Ik!7UZ-5gz?(Ktz7mQ9{N%*9)K+7)3=KPAfZR{+%qEwsG*%Jz50*=RF)pvX38
zkzS#VZQwk3ppb4v%7cvf+Ti2>H{I&!j9b${h8i)2`XBTMPB!f5Kso(6*yx_Hp0AFo
zbsz-^dSC<iTM$NGUbqO?F^~g`&QH>@K3(DuVolw&al>vbr-vsXq8&EfO=zmayuB)+
pex?Ab{kOpVF-QPb2gKHAatB{`Hm!Djox%VB002ovPDHLkV1hiZy5j%<

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..81d8a5810d8e65bbab520d548311c5696ac9ff1a
GIT binary patch
literal 2340
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
KMNUMnLSTY><a0Iv

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..689923f13bccf34459e07cdd0a603e99ffe02867
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq002M$001Be0{{R3l|zoU0001QP)t-sz`(#X
zA|z!@AAVjZKQ$sSCKF-<1AiwgwH^*gFfl?pGm~;J*ElC!Q$I5-B2Ga$N<b|uA`Ukz
z5yhEImvt~zIXq@uNz}D@PeD0oT2LPt3SUn}g>z;t+W!D$u!nYO6`cQuc4?@Tg*Po4
zu7)?D5xAQG0004WQchC<K<3zH0001edQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6
z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sVFmDH#ILk
zGcPr@C^IiziHkEOv#1y-W5~ssR+N~V3SpzDFRsi>$xOwiR9V5*&jsuj0N@oWo-i6*
z%K!iZ6-h)vR7i={Rbg|RFbuVjE!!&~TtlF+txMYf{~ITh<+czxyW6)Z*El_)m#6n6
z$C&>sphPv>pmlOMi;bEmA7cCxWALQrv3U^$C-pB4YW1Ow5TpFHK}Bc~yB-<)4pj<1
zv=pU-NNw;+en|Y<=Ml%;zj7M14hSY`VFJ>67*00vIOj3XBPV-$K%lsQAiPOEEb$Rx
z=u+x=%$P^+Q|gWY6iB`q;#&k^LXRq}DXmgJZ$g6QA3W$72@1gUbt(Wr@d&`Y8bN5b
zM(PdYx9|6P?-!Ae;2lV$T>Mc+<c96wc*`5RK_=nHJpcs{2E+(xe|<XifLlgU&biq+
z(G&BW?*XKaz!9}XPI?hb?*X<vqwR)-8Qsv?Gv?+IV2VD3;NzqK7{v3%igqKWWX<J#
z(D2Ftb_Sp^Fy?$Qt4kJba;q_yW13`=VcHo?q64YJT&%R^O-qKh>|z;5*~d0$kBAj%
z{a6!gt5gD(2_j5OZJ}|_EC4Ke>JNAiFabQwz%4j`B7ZP`X4dQ5GEBg7)+itkc3?zh
z7tPfPVW2s1qrk&SUaS+4X_SSEP!9cpRc5fWoy?<ZL$Pvapj)_`C|l6UMpTTH6)HO&
ze8q-!kJI%~>z9RMh$LtIW)=pu)PAJ{!SkzKB&Z^kpsE9ZB0PbRyR0?@zY(62ke#Yd
p;tk;$gYxt6_copf)#l(I<0qE*98wZ-1%Chl002ovPDHLkV1mSSa8dvO

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..66a740039ce7946f3896ed9a0543e0336bf0ecd4
GIT binary patch
literal 2013
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

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..3f4793f2cd4052217b19d9b252ab268a811b7833
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000OP)t-sz`(#_
z0|S32E43aDG$JI|I44y(JZ?!%B|40H00001bW%=J06^y0W&i*HZhBN$bVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQ>iF3UAMS0FC{ZoiHkEOv#1y-XvoExR+N~V3SlcNxca$(%?1G2bQ}h~
zMpbtJ007`gL_t(2k#&$=PQx$^fSaCRb{6$@j<*BEkq?kD*5@qr0F{uq0OI^0P?Hpa
z-~8$G?=buw24D}+`@>E^k)6Vp*`8YN;aN0cC8L+bbQNC((K8$`BAdd|(%Z^5R<H!R
zC(_bDrq`903e18NOz85~l#o^ptB1|-Fr&)U7GX+03MH<FAZzqk_ZSPRs@O-p1<)=9
zp*_H4(m-|UPfcI(b#9K~;Tss>2FKL>(40Tg{hhj!IH&nZI*?zkx7;<oxPYMURE5G0
uo#m>G0D&n0c5_YX_WTZa_yx@HUwi@y4<t`2a{BiG0000<MNUMnLSTaA<-zU%

literal 0
HcmV?d00001

diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm
index 4318e1b6ffa..252f568471a 100644
--- a/maps/tgstation2.dmm
+++ b/maps/tgstation2.dmm
@@ -1402,7 +1402,7 @@
 "aAX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/gateway)
 "aAY" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/rag,/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "bar"; name = "Bar Shutters"; opacity = 0},/obj/structure/noticeboard{pixel_x = -30; pixel_y = 0},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar)
 "aAZ" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes{pixel_y = 2},/turf/simulated/floor,/area/gateway)
-"aBa" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva)
+"aBa" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/engineering,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/engineering,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva)
 "aBb" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/atmos,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva)
 "aBc" = (/obj/machinery/light{dir = 4},/obj/structure/closet/l3closet/scientist,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/gateway)
 "aBd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/ai_monitored/storage/eva)
@@ -3555,7 +3555,7 @@
 "bqs" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/engine/chiefs_office)
 "bqt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/patient_wing)
 "bqu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/engine/chiefs_office)
-"bqv" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office)
+"bqv" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/rig/engineering/chief,/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/engineering/chief,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office)
 "bqw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Engineer's Desk"; departmentType = 6; name = "Chief Engineer RC"; pixel_x = 0; pixel_y = -34},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor,/area/engine/chiefs_office)
 "bqx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload)
 "bqy" = (/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload)
@@ -6307,7 +6307,7 @@
 "cro" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/stool/bed/chair/wheelchair,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/exam_room)
 "crp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/morgue)
 "crq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/engine/locker_room)
-"crr" = (/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/obj/machinery/door/window/southleft{name = "Engineering Hardsuits"; req_access_txt = "11"},/obj/structure/rack{dir = 8; layer = 2.6},/turf/simulated/floor,/area/engine/engine_eva)
+"crr" = (/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/engineering,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/engineering,/obj/machinery/door/window/southleft{name = "Engineering Hardsuits"; req_access_txt = "11"},/obj/structure/rack{dir = 8; layer = 2.6},/turf/simulated/floor,/area/engine/engine_eva)
 "crs" = (/obj/structure/table,/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/weapon/paper_bin{pixel_y = -6},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/weapon/pen/blue{pixel_x = 3; pixel_y = -5},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/medical/morgue)
 "crt" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central)
 "cru" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/engine/engine_eva)
@@ -6318,7 +6318,7 @@
 "crz" = (/obj/machinery/computer/station_alert,/turf/simulated/floor,/area/hallway/primary/aft)
 "crA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/reception)
 "crB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/reception)
-"crC" = (/obj/structure/rack{dir = 8; layer = 2.6},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/obj/machinery/light{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southleft{name = "Engineering Hardsuits"; req_access_txt = "11"},/turf/simulated/floor,/area/engine/engine_eva)
+"crC" = (/obj/structure/rack{dir = 8; layer = 2.6},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/engineering,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/engineering,/obj/machinery/light{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southleft{name = "Engineering Hardsuits"; req_access_txt = "11"},/turf/simulated/floor,/area/engine/engine_eva)
 "crD" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/reinforced,/obj/machinery/door_control{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 25},/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
 "crE" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor,/area/engine/engine_eva)
 "crF" = (/obj/structure/table,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/storage/box/cups{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/medical/reception)
@@ -8756,7 +8756,7 @@
 "dmt" = (/obj/item/weapon/extinguisher,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/djstation)
 "dmu" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/djstation)
 "dmv" = (/obj/machinery/driver_button{id = "constructiondriver1"; name = "Construction Driver #1"; pixel_x = 25},/turf/simulated/floor/plating,/area/djstation)
-"dmw" = (/obj/structure/table,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/turf/simulated/floor/plating,/area/djstation)
+"dmw" = (/obj/structure/table,/obj/item/clothing/suit/space/rig/engineering,/obj/item/clothing/head/helmet/space/rig/engineering,/turf/simulated/floor/plating,/area/djstation)
 "dmx" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless,/area/djstation)
 "dmy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/djstation)
 "dmz" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/djstation)