diff --git a/baystation12.dme b/baystation12.dme
index d56b35583f4..1da6e16ab99 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -855,6 +855,7 @@
#include "code\modules\clothing\head\hats.dm"
#include "code\modules\clothing\head\helmets.dm"
#include "code\modules\clothing\spacesuits\captain.dm"
+#include "code\modules\clothing\spacesuits\engineer.dm"
#include "code\modules\clothing\spacesuits\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\ninja.dm"
#include "code\modules\clothing\spacesuits\rig.dm"
diff --git a/code/game/objects/alien/resin.dm b/code/game/objects/alien/resin.dm
index e08ffaf5c42..5c0290664fd 100644
--- a/code/game/objects/alien/resin.dm
+++ b/code/game/objects/alien/resin.dm
@@ -50,7 +50,7 @@
/obj/effect/alien/resin/hitby(AM as mob|obj)
..()
for(var/mob/O in viewers(src, null))
- O.show_message(text("\red [src] was hit by [AM]."), 1)
+ O.show_message("\red [src] was hit by [AM].", 1)
var/tforce = 0
if(ismob(AM))
tforce = 10
@@ -64,9 +64,9 @@
/obj/effect/alien/resin/attack_hand()
if ((usr.mutations & HULK))
- usr << text("\blue You easily destroy the [name].")
+ usr << "\blue You easily destroy the [name]."
for(var/mob/O in oviewers(src))
- O.show_message(text("\red [] destroys the [name]!", usr), 1)
+ O.show_message("\red [usr] destroys the [name]!", 1)
health = 0
healthcheck()
return
@@ -77,15 +77,15 @@
/obj/effect/alien/resin/attack_alien()
if (islarva(usr))//Safety check for larva. /N
return
- usr << text("\green You claw at the [name].")
+ usr << "\green You claw at the [name]."
for(var/mob/O in oviewers(src))
- O.show_message(text("\red [] claws at the resin!", usr), 1)
+ O.show_message("\red [usr] claws at the resin!", 1)
playsound(loc, 'attackblob.ogg', 100, 1)
health -= rand(10, 20)
if(health <= 0)
- usr << text("\green You slice the [name] to pieces.")
+ usr << "\green You slice the [name] to pieces."
for(var/mob/O in oviewers(src))
- O.show_message(text("\red [] slices the [name] apart!", usr), 1)
+ O.show_message("\red [usr] slices the [name] apart!", 1)
healthcheck()
return
diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm
index 508a80cabb7..86bc423f0b6 100644
--- a/code/game/objects/closets/secure/personal.dm
+++ b/code/game/objects/closets/secure/personal.dm
@@ -72,7 +72,7 @@
playsound(src.loc, 'blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
for(var/mob/O in viewers(user, 3))
- O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
+ O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
else
user << "\red Access Denied"
return
diff --git a/code/game/objects/closets/secure/secure_closets.dm b/code/game/objects/closets/secure/secure_closets.dm
index 35c45401c1b..7abcc6ae059 100644
--- a/code/game/objects/closets/secure/secure_closets.dm
+++ b/code/game/objects/closets/secure/secure_closets.dm
@@ -56,15 +56,15 @@
playsound(src.loc, 'blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
for(var/mob/O in viewers(user, 3))
- O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
+ O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
else
for(var/mob/O in viewers(user, 3))
- O.show_message(text("\blue The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2)
+ O.show_message("\blue The locker has been broken by [user] with an electromagnetic card!", 1, "You hear a faint electrical spark.", 2)
else if(src.allowed(user))
src.locked = !src.locked
for(var/mob/O in viewers(user, 3))
if((O.client && !( O.blinded )))
- O << text("\blue The locker has been []locked by [].", (src.locked ? null : "un"), user)
+ O << "\blue The locker has been [src.locked ? null : "un"]locked by [user]."
if(src.locked)
src.icon_state = src.icon_locked
else
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index 6aafd6c53a8..8978aefcd6c 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -428,10 +428,10 @@ THERMAL GLASSES
M.disabilities &= ~1
..()
-/obj/item/clothing/head/helmet/space/rig/engspace_helmet/attack_self()
+/obj/item/clothing/head/helmet/space/engineer/attack_self()
toggle()
-/obj/item/clothing/head/helmet/space/rig/engspace_helmet/verb/toggle()
+/obj/item/clothing/head/helmet/space/engineer/verb/toggle()
set category = "Object"
set name = "Toggle Helmet Visor"
if(usr.canmove && usr.stat != 2 && !usr.restrained())
@@ -439,34 +439,13 @@ THERMAL GLASSES
src.up = !src.up
src.see_face = !src.see_face
src.flags |= HEADCOVERSEYES
- icon_state = "engspace_helmet"
+ icon_state = "[initial(icon_state)]"
usr << "You toggle the reflective tint on."
else
src.up = !src.up
src.see_face = !src.see_face
src.flags &= ~HEADCOVERSEYES
- icon_state = "engspace_helmet_clear"
- usr << "You toggle the reflective tint off."
- usr.update_clothing()
-
-/obj/item/clothing/head/helmet/space/rig/cespace_helmet/attack_self()
- toggle()
-
-/obj/item/clothing/head/helmet/space/rig/cespace_helmet/verb/toggle()
- set category = "Object"
- set name = "Toggle Helmet Visor"
- if(usr.canmove && usr.stat != 2 && !usr.restrained())
- if(src.up)
- src.up = !src.up
- src.see_face = !src.see_face
- src.flags |= HEADCOVERSEYES
- icon_state = "cespace_helmet"
- usr << "You toggle the reflective tint on."
- else
- src.up = !src.up
- src.see_face = !src.see_face
- src.flags &= ~HEADCOVERSEYES
- icon_state = "cespace_helmet_clear"
+ icon_state = "[initial(icon_state)]_clear"
usr << "You toggle the reflective tint off."
usr.update_clothing()
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 6edbbf80491..132fd7e00cc 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,6 +1,27 @@
obj/structure
icon = 'structures.dmi'
+obj/structure/blob_act()
+ if(prob(50))
+ del(src)
+
+obj/structure/ex_act(severity)
+ switch(severity)
+ if(1.0)
+ del(src)
+ return
+ if(2.0)
+ if(prob(50))
+ del(src)
+ return
+ if(3.0)
+ return
+
+obj/structure/meteorhit(obj/O as obj)
+ del(src)
+
+
+
/obj/structure/girder
icon_state = "girder"
anchored = 1
diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm
index fef13487454..507541284b5 100644
--- a/code/game/objects/tables_racks.dm
+++ b/code/game/objects/tables_racks.dm
@@ -39,10 +39,10 @@ TABLE AND RACK OBJECT INTERATIONS
/obj/structure/table/attack_paw(mob/user as mob)
if ((usr.mutations & HULK))
- usr << text("\blue You destroy the table.")
+ usr << "\blue You destroy the table."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes the table apart!", usr)
+ O << "\red [user] smashes the table apart!"
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
@@ -57,16 +57,16 @@ TABLE AND RACK OBJECT INTERATIONS
user.layer = TURF_LAYER
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("[] hides under the table!", user)
+ O << "[user] hides under the table!"
//Foreach goto(69)
return
/obj/structure/table/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
- usr << text("\green You destroy the table.")
+ usr << "\green You destroy the table."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] slices the table apart!", user)
+ O << "\red [user] slices the table apart!"
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
@@ -80,10 +80,10 @@ TABLE AND RACK OBJECT INTERATIONS
/obj/structure/table/attack_animal(mob/living/simple_animal/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
if(user.wall_smash)
- usr << text("\red You destroy the table.")
+ usr << "\red You destroy the table."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes the table apart!", user)
+ O << "\red [user] smashes the table apart!"
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
@@ -98,11 +98,11 @@ TABLE AND RACK OBJECT INTERATIONS
/obj/structure/table/attack_hand(mob/user as mob)
- if (usr.mutations & HULK)
- usr << text("\blue You destroy the table.")
+ if ((usr.mutations & HULK))
+ usr << "\blue You destroy the table."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes the table apart!", usr)
+ O << "\red [user] smashes the table apart!"
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
@@ -196,7 +196,7 @@ TABLE AND RACK OBJECT INTERATIONS
G.affecting.Weaken(5)
for(var/mob/O in viewers(world.view, src))
if (O.client)
- O << text("\red [] puts [] on the table.", G.assailant, G.affecting)
+ O << "\red [G.assailant] puts [G.affecting] on the table."
del(W)
return
@@ -220,7 +220,7 @@ TABLE AND RACK OBJECT INTERATIONS
playsound(src.loc, 'blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
for(var/mob/O in viewers(user, 4))
- O.show_message(text("\blue The table was sliced apart by []!", user), 1, text("\red You hear metal coming apart."), 2)
+ O.show_message("\blue The table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2)
new /obj/item/weapon/table_parts( src.loc )
del(src)
return
@@ -242,7 +242,7 @@ TABLE AND RACK OBJECT INTERATIONS
G.affecting.Weaken(5)
for(var/mob/O in viewers(world.view, src))
if (O.client)
- O << text("\red [] puts [] on the wooden table.", G.assailant, G.affecting)
+ O << "\red [G.assailant] puts [G.affecting] on the wooden table."
del(W)
return
if (istype(W, /obj/item/weapon/wrench))
@@ -262,7 +262,7 @@ TABLE AND RACK OBJECT INTERATIONS
playsound(src.loc, 'blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
for(var/mob/O in viewers(user, 4))
- O.show_message(text("\blue The wooden table was sliced apart by []!", user), 1, text("\red You hear wood coming apart."), 2)
+ O.show_message("\blue The wooden table was sliced apart by [user]!", 1, "\red You hear wood coming apart.", 2)
new /obj/item/weapon/table_parts/wood( src.loc )
del(src)
return
@@ -284,7 +284,7 @@ TABLE AND RACK OBJECT INTERATIONS
G.affecting.Weaken(5)
for(var/mob/O in viewers(world.view, src))
if (O.client)
- O << text("\red [] puts [] on the reinforced table.", G.assailant, G.affecting)
+ O << "\red [G.assailant] puts [G.affecting] on the reinforced table."
del(W)
return
@@ -332,7 +332,7 @@ TABLE AND RACK OBJECT INTERATIONS
playsound(src.loc, 'blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
for(var/mob/O in viewers(user, 4))
- O.show_message(text("\blue The reinforced table was sliced apart by []!", user), 1, text("\red You hear metal coming apart."), 2)
+ O.show_message("\blue The reinforced table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2)
new /obj/item/weapon/table_parts/reinforced( src.loc )
del(src)
return
diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm
index 6d04a7d4ea0..daafe770ef3 100644
--- a/code/game/objects/weapons.dm
+++ b/code/game/objects/weapons.dm
@@ -86,7 +86,7 @@
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
for(var/mob/O in viewers(world.view, src.loc))
- O << text("[M] triggered the \icon[] [src]", src)
+ O << "[M] triggered the \icon[src] [src]"
triggered = 1
call(src,triggerproc)(M)
@@ -166,7 +166,7 @@
for(var/mob/O in viewers(user, null))
if(O == user)
continue
- O.show_message(text("\red [user] accidentally sets off the mousetrap, breaking their fingers."), 1)
+ O.show_message("\red [user] accidentally sets off the mousetrap, breaking their fingers.", 1)
return
user << "\blue You disarm the mousetrap."
armed = !armed
@@ -183,7 +183,7 @@
for(var/mob/O in viewers(user, null))
if(O == user)
continue
- O.show_message(text("\red [user] accidentally sets off the mousetrap, breaking their fingers."), 1)
+ O.show_message("\red [user] accidentally sets off the mousetrap, breaking their fingers.", 1)
return
..()
@@ -196,12 +196,12 @@
for(var/mob/O in viewers(H, null))
if(O == H)
continue
- O.show_message(text("\red [H] accidentally steps on the mousetrap."), 1)
+ O.show_message("\red [H] accidentally steps on the mousetrap.", 1)
..()
/obj/item/weapon/mousetrap/hitby(A as mob|obj)
if(!armed)
return ..()
for(var/mob/O in viewers(src, null))
- O.show_message(text("\red The mousetrap is triggered by [A]."), 1)
+ O.show_message("\red The mousetrap is triggered by [A].", 1)
src.triggered(null)
diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index ee9871be0fc..662cf0321a3 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -68,7 +68,7 @@
..()
for(var/mob/O in viewers(src, null))
- O.show_message(text("\red [src] was hit by [AM]."), 1)
+ O.show_message("\red [src] was hit by [AM].", 1)
var/tforce = 0
if(ismob(AM))
tforce = 40
@@ -90,12 +90,14 @@
..()
return
+//These all need to be rewritten to use visiblemessage()
+
/obj/structure/window/attack_hand()
if ((usr.mutations & HULK))
- usr << text("\blue You smash through the window.")
+ usr << "\blue You smash through the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes through the window!", usr)
+ O << "\red [usr] smashes through the window!"
src.health = 0
new /obj/item/weapon/shard( src.loc )
if(reinf) new /obj/item/stack/rods( src.loc)
@@ -112,10 +114,10 @@
/obj/structure/window/attack_paw()
if ((usr.mutations & HULK))
- usr << text("\blue You smash through the window.")
+ usr << "\blue You smash through the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes through the window!", usr)
+ O << "\red [usr] smashes through the window!"
src.health = 0
new /obj/item/weapon/shard( src.loc )
if(reinf) new /obj/item/stack/rods( src.loc)
@@ -126,17 +128,17 @@
/obj/structure/window/attack_alien()
if (istype(usr, /mob/living/carbon/alien/larva))//Safety check for larva. /N
return
- usr << text("\green You smash against the window.")
+ usr << "\green You smash against the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes against the window.", usr)
+ O << "\red [usr] smashes against the window."
playsound(src.loc, 'Glasshit.ogg', 100, 1)
src.health -= 15
if(src.health <= 0)
- usr << text("\green You smash through the window.")
+ usr << "\green You smash through the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes through the window!", usr)
+ O << "\red [usr] smashes through the window!"
src.health = 0
new /obj/item/weapon/shard(src.loc)
if(reinf)
@@ -150,17 +152,17 @@
/obj/structure/window/attack_animal(mob/living/simple_animal/M as mob)
if (M.melee_damage_upper == 0)
return
- M << text("\green You smash against the window.")
+ M << "\green You smash against the window."
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes against the window.", M)
+ O << "\red [M] smashes against the window."
playsound(src.loc, 'Glasshit.ogg', 100, 1)
src.health -= M.melee_damage_upper
if(src.health <= 0)
- M << text("\green You smash through the window.")
+ M << "\green You smash through the window."
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes through the window!", M)
+ O << "\red [M] smashes through the window!"
src.health = 0
new /obj/item/weapon/shard(src.loc)
if(reinf)
@@ -174,17 +176,17 @@
if(!istype(usr, /mob/living/carbon/metroid/adult))
return
- usr<< text("\green You smash against the window.")
+ usr<< "\green You smash against the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes against the window.", usr)
+ O << "\red [usr] smashes against the window."
playsound(src.loc, 'Glasshit.ogg', 100, 1)
src.health -= rand(10,15)
if(src.health <= 0)
- usr << text("\green You smash through the window.")
+ usr << "\green You smash through the window."
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] smashes through the window!", usr)
+ O << "\red [usr] smashes through the window!"
src.health = 0
new /obj/item/weapon/shard(src.loc)
if(reinf)
diff --git a/code/modules/clothing/spacesuits/engineer.dm b/code/modules/clothing/spacesuits/engineer.dm
new file mode 100644
index 00000000000..5ede859031e
--- /dev/null
+++ b/code/modules/clothing/spacesuits/engineer.dm
@@ -0,0 +1,37 @@
+/obj/item/clothing/head/helmet/space/engineer
+ name = "environment suit helmet"
+ desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding and a visor that can be toggled on and off."
+ flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES
+ see_face = 0.0
+ flags_inv = HIDEEARS
+ icon_state = "engspace_helmet"
+ item_state = "engspace_helmet"
+ protective_temperature = 5000
+ armor = list(melee = 20, bullet = 5, laser = 10,energy = 5, bomb = 15, bio = 100, rad = 75)
+ var/up = 0
+
+/obj/item/clothing/head/helmet/space/engineer/ce
+ name = "chief engineer's environment suit helmet"
+ desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding and a visor that can be toggled on and off."
+ icon_state = "cespace_helmet"
+ item_state = "cespace_helmet"
+
+/obj/item/clothing/suit/space/engineer
+ name = "environment suit"
+ desc = "An environment suit that protects against hazardous, low pressure environments. Has radiation shielding."
+ icon_state = "engspace_suit"
+ item_state = "engspace_suit"
+ protective_temperature = 5000 //For not dieing near a fire, but still not being great in a full inferno
+ slowdown = 2
+ armor = list(melee = 20, bullet = 5, laser = 10,energy = 5, bomb = 15, bio = 100, rad = 75)
+ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
+ /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/device/multitool, \
+ /obj/item/device/radio, /obj/item/device/analyzer)
+ //yes, you can fit everything and your dog in it.
+ //i figure this might mitigate some of the inevitable bitching about it being a downgrade from the rig.
+
+/obj/item/clothing/suit/space/engineer/ce
+ name = "chief engineer's environment suit"
+ desc = "An environment suit that protects against hazardous, low pressure environments. Has radiation shielding and Chief Engineer colours."
+ icon_state = "cespace_suit"
+ item_state = "cespace_suit"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 0aa74b947b5..c37bcf0ed34 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -15,29 +15,12 @@
item_state = "rig0-mining"
color = "mining"
-
/obj/item/clothing/head/helmet/space/rig/elite
name = "advanced RIG helmet"
icon_state = "rig0-white"
item_state = "rig0-white"
color = "white"
-/obj/item/clothing/head/helmet/space/rig/engspace_helmet
- name = "engineering space helmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding and a visor that can be toggled on and off."
- icon_state = "engspace_helmet"
- item_state = "engspace_helmet"
- see_face = 0.0
- var/up = 0
-
-/obj/item/clothing/head/helmet/space/rig/cespace_helmet
- name = "chief engineer's space helmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding and a visor that can be toggled on and off."
- icon_state = "cespace_helmet"
- item_state = "cespace_helmet"
- see_face = 0.0
- var/up = 0
-
/obj/item/clothing/head/helmet/space/rig/security
name = "security RIG helmet"
icon_state = "rig0-security"
@@ -63,18 +46,6 @@
name = "advanced RIG suit"
protective_temperature = 10000
-/obj/item/clothing/suit/space/rig/engspace_suit
- name = "engineering space suit"
- icon_state = "engspace_suit"
- item_state = "engspace_suit"
-
-/obj/item/clothing/suit/space/rig/cespace_suit
- name = "chief engineer's space suit"
- desc = "A special suit that protects against hazardous, low pressure environments. Has radiation and fire shielding, and Chief Engineer colours."
- icon_state = "cespace_suit"
- item_state = "cespace_suit"
- protective_temperature = 10000
-
/obj/item/clothing/suit/space/rig/security
name = "security RIG suit"
desc = "A suit specially designed for security to offer minor protection from environmental hazards, and greater protection from human hazards"
diff --git a/icons/obj/atmospherics/mixer.dmi b/icons/obj/atmospherics/mixer.dmi
index f592d73e8be..79b62c87df2 100644
Binary files a/icons/obj/atmospherics/mixer.dmi and b/icons/obj/atmospherics/mixer.dmi differ
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index 9972a419d41..210546e5a97 100755
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -5666,12 +5666,12 @@
"ceX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/engine/engineering)
"ceY" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -29},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engine/engineering)
"ceZ" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engine/engineering)
-"cfa" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/suit/space/rig/engspace_suit,/obj/item/clothing/head/helmet/space/rig/engspace_helmet,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor,/area/engine/engineering)
+"cfa" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/suit/space/engineer,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/item/clothing/head/helmet/space/engineer,/turf/simulated/floor,/area/engine/engineering)
"cfb" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/machinery/camera{c_tag = "Tool Storage/CE's Room"; dir = 1; network = "Engineering"; pixel_x = 23},/turf/simulated/floor,/area/engine/engineering)
"cfc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/engine/chiefs_office)
"cfd" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/clipboard,/obj/item/weapon/stamp/ce,/obj/item/clothing/glasses/meson,/obj/item/ashtray/glass,/turf/simulated/floor,/area/engine/chiefs_office)
"cfe" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-2"; tag = "90Curve"},/obj/effect/landmark/start{name = "Chief Engineer"},/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor,/area/engine/chiefs_office)
-"cff" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Engineer's office"; departmentType = 3; name = "Chief Engineer RC"; pixel_x = 30; pixel_y = 0},/obj/item/clothing/suit/space/rig/cespace_suit,/obj/item/clothing/head/helmet/space/rig/cespace_helmet,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/head/helmet/space/rig/elite,/obj/item/clothing/mask/breath,/turf/simulated/floor,/area/engine/chiefs_office)
+"cff" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Engineer's office"; departmentType = 3; name = "Chief Engineer RC"; pixel_x = 30; pixel_y = 0},/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/head/helmet/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/engineer/ce,/obj/item/clothing/head/helmet/space/engineer/ce,/turf/simulated/floor,/area/engine/chiefs_office)
"cfg" = (/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
"cfh" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
"cfi" = (/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
@@ -5860,7 +5860,7 @@
"ciJ" = (/obj/structure/particle_accelerator/power_box,/turf/simulated/floor/plating,/area/engine/particle_accelerator)
"ciK" = (/obj/item/weapon/screwdriver,/turf/simulated/floor/plating,/area/engine/particle_accelerator)
"ciL" = (/obj/machinery/pipedispenser,/turf/simulated/floor/plating,/area/engine/engineering)
-"ciM" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/engspace_suit,/obj/item/clothing/head/helmet/space/rig/engspace_helmet,/turf/simulated/floor/plating,/area/engine/engineering)
+"ciM" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/engineer,/obj/item/clothing/head/helmet/space/engineer,/turf/simulated/floor/plating,/area/engine/engineering)
"ciN" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/turf/simulated/floor/plating,/area/engine/engineering)
"ciO" = (/obj/machinery/emitter,/turf/simulated/floor/plating,/area/engine/engineering)
"ciP" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plating,/area/engine/engineering)