diff --git a/code/__DEFINES/_planes+layers.dm b/code/__DEFINES/_planes+layers.dm
index 34a79b65911..aacd8bcc1f7 100644
--- a/code/__DEFINES/_planes+layers.dm
+++ b/code/__DEFINES/_planes+layers.dm
@@ -125,13 +125,8 @@ What is the naming convention for planes or layers?
#define PLANE_CH_SPECIAL 23 //Special role icon (revhead or w/e)
#define PLANE_CH_STATUS_OOC 24 //OOC status hud for spooks
-
-#define BELOW_FULLSCREEN_LAYER 31 //Lifesign detector blip
-
-
#define PLANE_MESONS 32 //Stuff seen with mesons, like open ceilings. This is 30 for downstreams.
-
#define PLANE_ADMIN2 33 //Purely for shenanigans (above lighting)
//Fullscreen overlays under inventory
diff --git a/code/__DEFINES/atmospherics/atmospheres.dm b/code/__DEFINES/atmospherics/atmospheres.dm
index 151fbd7525b..dddfea21250 100644
--- a/code/__DEFINES/atmospherics/atmospheres.dm
+++ b/code/__DEFINES/atmospherics/atmospheres.dm
@@ -5,3 +5,7 @@
#define ATMOSPHERE_ID_VIRGO2 /datum/atmosphere/planet/virgo2
/// Virgo 3b (station) planetary atmosphere ID
#define ATMOSPHERE_ID_VIRGO3B /datum/atmosphere/planet/virgo3b
+
+// Riftmap
+///Lythios 43c planetary atmosphere ID
+#define ATMOSPHERE_ID_LYTHIOS43C /datum/atmosphere/planet/lythios43c
diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm
index cc3ae30b976..7290a464078 100644
--- a/code/game/jobs/access_datum.dm
+++ b/code/game/jobs/access_datum.dm
@@ -384,12 +384,6 @@
desc = "Medical Equipment"
region = ACCESS_REGION_MEDBAY
-/var/const/access_iff_station = 70
-/datum/access/iff_station
- id = access_iff_station
- desc = "Identification friend or foe"
- region = ACCESS_REGION_GENERAL
-
/******************
* Central Command *
******************/
@@ -458,7 +452,6 @@
/*******
* Misc *
*******/
-
/var/const/access_synth = 199
/datum/access/synthetic
id = access_synth
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index c8cf16a1d4d..7b77d9dae2b 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -60,13 +60,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
- access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_iff_station)
+ access_hop, access_RC_announce, access_keycard_auth, access_gateway)
minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
- access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_iff_station)
+ access_hop, access_RC_announce, access_keycard_auth, access_gateway)
/datum/job/secretary
title = "Command Secretary"
@@ -83,8 +83,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimal_player_age = 5
economic_modifier = 7
- access = list(access_heads, access_keycard_auth, access_iff_station)
- minimal_access = list(access_heads, access_keycard_auth, access_iff_station)
+ access = list(access_heads, access_keycard_auth)
+ minimal_access = list(access_heads, access_keycard_auth)
alt_titles = list("Bridge Officer")
outfit_type = /decl/hierarchy/outfit/job/secretary
diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm
index 1c70c7ca571..ad30f51e812 100755
--- a/code/game/jobs/job/special.dm
+++ b/code/game/jobs/job/special.dm
@@ -95,7 +95,7 @@
idtype = /obj/item/card/id/civilian/clown
economic_modifier = 1
access = list()
- minimal_access = list(access_iff_station)
+ minimal_access = list()
alt_titles = list("Comedian","Jester")
whitelist_only = 1
latejoin_only = 1
@@ -114,7 +114,7 @@
idtype = /obj/item/card/id/civilian/mime
economic_modifier = 1
access = list()
- minimal_access = list(access_iff_station)
+ minimal_access = list()
alt_titles = list("Performer","Interpretive Dancer")
whitelist_only = 1
latejoin_only = 1
diff --git a/code/game/objects/items/motion_detector.dm b/code/game/objects/items/motion_detector.dm
deleted file mode 100644
index 92ff10a9fcd..00000000000
--- a/code/game/objects/items/motion_detector.dm
+++ /dev/null
@@ -1,305 +0,0 @@
-
-#define MOTION_DETECTOR_LONG 0
-#define MOTION_DETECTOR_SHORT 1
-
-#define MOTION_DETECTOR_HOSTILE 0
-#define MOTION_DETECTOR_FRIENDLY 1
-#define MOTION_DETECTOR_DEAD 2
-#define MOTION_DETECTOR_FUBAR 3 //i.e. can't be revived. Might have useful gear to loot though!
-
-#define DEFIB_TIME_LIMIT (10 MINUTES) //CitadelRP addition for checking if revivable
-
-
-/obj/effect/detector_blip
- icon = 'icons/obj/detector.dmi'
- icon_state = "detector_blip"
- var/identifier = MOTION_DETECTOR_HOSTILE
- layer = BELOW_FULLSCREEN_LAYER
-
-/obj/effect/detector_blip/friendly
- icon_state = "detector_blip_friendly"
- identifier = MOTION_DETECTOR_FRIENDLY
-
-/obj/effect/detector_blip/dead
- icon_state = "detector_blip_dead"
- identifier = MOTION_DETECTOR_DEAD
-
-/obj/effect/detector_blip/fubar
- icon_state = "detector_blip_fubar"
- identifier = MOTION_DETECTOR_FUBAR
-
-/obj/item/motiondetector
- name = "BioScanner"
- desc = "A device that searches for life signs through an array of short range sensors to detect breathing, body temperature, sound, and approximate cross-section. Crew with the correct IFF signature appear as green, their bodies as blue, unrecoverable bodies as dark blue, all other life signs appear as red blips. It has a mode selection interface."
- icon = 'icons/obj/detector.dmi'
- icon_state = "detector_off"
- item_state = "electronic"
- flags = CONDUCT
- slot_flags = SLOT_BELT
- var/list/blip_pool = list()
- var/detector_range = 14
- var/detector_mode = MOTION_DETECTOR_LONG
- w_class = ITEMSIZE_SMALL
- var/active = 0
- var/recycletime = 120
- var/long_range_cooldown = 2
- var/iff_signal = "access_iff_station"
- var/detect_friendlies = TRUE
- var/detect_revivable = TRUE
- var/detect_fubar = TRUE
- var/ping = TRUE
- var/mob/living/carbon/human/operator
-
-/obj/item/motiondetector/examine(mob/user as mob)
- if(get_dist(user,src) > 2)
- to_chat(user, "You're too far away to see [src]'s display!")
- else
- var/details
- details += "[active ? " Power: ON" : " Power: OFF"]"
- details += "[detect_friendlies ? " Friendly detection: ACTIVE" : " Friendly detection: INACTIVE"]"
- details += "[detect_revivable ? " Friendly revivable corpse detection: ACTIVE" : " Friendly revivable corpse detection: INACTIVE"]"
- details += "[detect_fubar ? " Friendly unrevivable corpse detection: ACTIVE" : " Friendly unrevivable corpse detection: INACTIVE"]"
- to_chat(user, "[src]'s display shows the following settings:[details]")
- return ..()
-
-
-/obj/item/motiondetector/Destroy()
- for(var/obj/X in blip_pool)
- qdel(X)
- blip_pool = list()
- return ..()
-
-/obj/item/motiondetector/dropped(mob/user)
- . = ..()
- operator = null
-
-
-/obj/item/motiondetector/update_icon()
- if(active)
- icon_state = "detector_on_[detector_mode]"
- else
- icon_state = "detector_off"
- return ..()
-
-/obj/item/motiondetector/proc/deactivate()
- active = FALSE
- operator = null
- update_icon()
-
-/obj/item/motiondetector/process()
- if(!active)
- deactivate()
- return
-
- if(!operator)
- deactivate()
- return
-
- if(get_turf(src) != get_turf(operator))
- deactivate()
- return
-
- if(operator.stat == DEAD)
- deactivate()
- return
-
- if(!operator.client)
- deactivate()
- return
-
- recycletime--
- if(!recycletime)
- recycletime = initial(recycletime)
- for(var/X in blip_pool) //we dump and remake the blip pool every few minutes
- if(blip_pool[X]) //to clear blips assigned to mobs that are long gone.
- qdel(blip_pool[X]) //the blips are garbage-collected and reused via rnew() below
- blip_pool = list()
-
- if(!detector_mode)
- long_range_cooldown--
- if(long_range_cooldown)
- return
- else
- long_range_cooldown = initial(long_range_cooldown)
-
- if(ping)
- playsound(src.loc, 'sound/items/detector.ogg', 60, 1)
-
- var/detected
- var/status
- for(var/mob/living/M in orange(detector_range, operator))
- if(!isturf(M.loc))
- continue
- status = MOTION_DETECTOR_HOSTILE //Reset the status to default
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/deadtime = world.time - H.timeofdeath
- if(H.get_target_lock(iff_signal)) //device checks for IFF data and status
- if(M.stat == DEAD)
- if((deadtime > DEFIB_TIME_LIMIT && !H.isSynthetic()) && !H.client && !H.teleop)
- if(detect_revivable)
- status = MOTION_DETECTOR_DEAD //Dead, but revivable.
- else
- continue
- else
- if(detect_fubar)
- status = MOTION_DETECTOR_FUBAR //Dead and unrevivable; FUBAR
- else
- continue
- else
- if(detect_friendlies)
- status = MOTION_DETECTOR_FRIENDLY
- else
- continue
- if(world.time > M.last_move_time + 30 && (status == MOTION_DETECTOR_HOSTILE))
- continue //hasn't moved recently
-
- detected = TRUE
-
- show_blip(operator, M, status)
-
- if(detected && ping)
- playsound(src.loc, 'sound/items/tick.ogg', 50, 1)
-
-
-/obj/item/motiondetector/proc/show_blip(mob/user, mob/target, status)
- set waitfor = FALSE
- if(user.client)
- if(!blip_pool[target])
- switch(status)
- if(MOTION_DETECTOR_HOSTILE)
- blip_pool[target] = new /obj/effect/detector_blip()
- //blip_pool[target].icon_state = "detector_blip_friendly"
- if(MOTION_DETECTOR_FRIENDLY)
- blip_pool[target] = new /obj/effect/detector_blip/friendly()
- //blip_pool[target].icon_state = "detector_blip_friendly"
- if(MOTION_DETECTOR_DEAD)
- blip_pool[target] = new /obj/effect/detector_blip/dead()
- //blip_pool[target].icon_state = "detector_blip_dead"
- if(MOTION_DETECTOR_FUBAR)
- blip_pool[target] = new /obj/effect/detector_blip/fubar()
- //blip_pool[target].icon_state = "detector_blip_fubar"
-
- var/obj/effect/detector_blip/DB = blip_pool[target]
- var/c_view = user.client.view
- var/view_x_offset = 0
- var/view_y_offset = 0
- if(c_view > 7)
- if(user.client.pixel_x >= 0) view_x_offset = round(user.client.pixel_x/32)
- else view_x_offset = CEILING(user.client.pixel_x/32, 1)
- if(user.client.pixel_y >= 0) view_y_offset = round(user.client.pixel_y/32)
- else view_y_offset = CEILING(user.client.pixel_y/32, 1)
-
- var/diff_dir_x = 0
- var/diff_dir_y = 0
- if(target.x - user.x > c_view + view_x_offset) diff_dir_x = 4
- else if(target.x - user.x < -c_view + view_x_offset) diff_dir_x = 8
- if(target.y - user.y > c_view + view_y_offset) diff_dir_y = 1
- else if(target.y - user.y < -c_view + view_y_offset) diff_dir_y = 2
- if(diff_dir_x || diff_dir_y)
- switch(status)
- if(MOTION_DETECTOR_HOSTILE)
- DB.icon_state = "detector_blip_dir"
- if(MOTION_DETECTOR_FRIENDLY)
- DB.icon_state = "detector_blip_dir_friendly"
- if(MOTION_DETECTOR_DEAD)
- DB.icon_state = "detector_blip_dir_dead"
- if(MOTION_DETECTOR_FUBAR)
- DB.icon_state = "detector_blip_dir_fubar"
- DB.dir = (diff_dir_x + diff_dir_y)
- else
- DB.dir = initial(DB.dir) //Update the ping sprite
- switch(status)
- if(MOTION_DETECTOR_HOSTILE)
- DB.icon_state = "detector_blip"
- if(MOTION_DETECTOR_FRIENDLY)
- DB.icon_state = "detector_blip_friendly"
- if(MOTION_DETECTOR_DEAD)
- DB.icon_state = "detector_blip_dead"
- if(MOTION_DETECTOR_FUBAR)
- DB.icon_state = "detector_blip_fubar"
-
- DB.screen_loc = "[CLAMP(c_view + 1 - view_x_offset + (target.x - user.x), 1, 2*c_view+1)],[CLAMP(c_view + 1 - view_y_offset + (target.y - user.y), 1, 2*c_view+1)]"
- user.client.screen += DB
- //addtimer(CALLBACK(src, .proc/remove_blip, user, DB), 1 SECONDS)
- spawn(2 SECONDS) remove_blip()
-
-/obj/item/motiondetector/proc/remove_blip(mob/user, blip)
- if(!user?.client)
- return
- user.client.screen -= blip
-
-/obj/item/motiondetector/Topic(href, href_list)
- . = ..()
- if(.)
- return
- if(usr.stat || usr.restrained())
- return
- if(ishuman(usr) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf))))
- if(href_list["power"])
- active = !active
- if(active)
- to_chat(usr, "You activate [src].")
- operator = usr
- else
- to_chat(usr, "You deactivate [src].")
- update_icon()
-
- else if(href_list["detector_mode"])
- detector_mode = !detector_mode
- if(detector_mode)
- to_chat(usr, "You switch [src] to short range mode.")
- detector_range = 7
- else
- to_chat(usr, "You switch [src] to long range mode.")
- detector_range = 14
-
- else if(href_list["detect_friendlies"])
- detect_friendlies = !( detect_friendlies )
- else if(href_list["detect_revivable"])
- detect_revivable = !( detect_revivable )
- else if(href_list["detect_fubar"])
- detect_fubar = !( detect_fubar )
-
- update_icon()
-
- if(!( master ))
- if(istype(loc, /mob))
- attack_self(loc)
- else
- for(var/mob/M in viewers(1, src))
- if(M.client)
- attack_self(M)
- else
- if(istype(master.loc, /mob))
- attack_self(master.loc)
- else
- for(var/mob/M in viewers(1, master))
- if(M.client)
- attack_self(M)
- else
- usr << browse(null, "window=radio")
-
-
-/obj/item/motiondetector/attack_self(mob/user as mob, flag1)
- if(!ishuman(user))
- return
- var/dat = {"
-Power Control: [active ? "On" : "Off"]
-
-Detection Settings:
-
-Detection Mode: [detector_mode ? "Short Range" : "Long Range"]
-Set Detector Mode: [detector_mode ? "Long Range" : "Short Range"]
-
-Friendly Detection Status: [detect_friendlies ? "ACTIVE" : "INACTIVE"]
-Set Friendly Detection: [detect_friendlies ? "Off" : "On"]
-
-Revivable Detection Status: [detect_revivable ? "ACTIVE" : "INACTIVE"]
-Set Revivable Detection: [detect_revivable ? "Off" : "On"]
-
-Unrevivable Detection Status: [detect_fubar ? "ACTIVE" : "INACTIVE"]
-Set Unrevivable Detection: [detect_fubar ? "Off" : "On"]
-"}
- user << browse(dat, "window=radio")
- onclose(user, "radio")
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index c79b94fd327..0c51235d5dd 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -11,7 +11,7 @@
/obj/structure/lattice/Initialize()
. = ..()
- if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral) || istype(src.loc, /turf/simulated/icerock)))
+ if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
return INITIALIZE_HINT_QDEL
for(var/obj/structure/lattice/LAT in src.loc)
diff --git a/code/game/objects/structures/ventcover.dm b/code/game/objects/structures/ventcover.dm
index 6bda7791435..222da8b3723 100644
--- a/code/game/objects/structures/ventcover.dm
+++ b/code/game/objects/structures/ventcover.dm
@@ -11,10 +11,10 @@
plane = PLATING_PLANE
// flags = CONDUCT
-/obj/structure/ventcover/initialize()
+/obj/structure/ventcover/Initialize()
. = ..()
- if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral) || istype(src.loc, /turf/simulated/icerock)))
+ if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
return INITIALIZE_HINT_QDEL
for(var/obj/structure/ventcover/VENT in src.loc)
@@ -48,29 +48,26 @@
var/turf/T = get_turf(src)
T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
return
-
-/obj/structure/ventcover/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W,/obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
+ if(istype(C, /obj/item/weldingtool))
+ var/obj/item/weldingtool/WT = C
if(WT.welding == 1)
- if(WT.remove_fuel(0,user))
- user << "Slicing off plating..."
- new /obj/item/stack/rods
- new /obj/item/stack/rods
+ if(WT.remove_fuel(0, user))
+ to_chat(user, "Slicing lattice joints ...")
+ new /obj/item/stack/rods(src.loc)
qdel(src)
else
to_chat(user, "You need more welding fuel to complete this task.")
- if(W.is_crowbar())
+ if(istype(C, /obj/item/tool/crowbar))
to_chat(user, "You start prying [open? "closed":"open"] the vent cover...")
- playsound(src, W.usesound, 100, 1)
- if(do_after(user, 5 SECONDS * W.toolspeed))
+ playsound(src, C.usesound, 100, 1)
+ if(do_after(user, 5 SECONDS * C.toolspeed))
open = !open
to_chat(user, "You pry [open? "open":"close"] the cover.")
update_icon()
- if(W.is_screwdriver())
+ if(istype(C, /obj/item/tool/screwdriver))
to_chat(user, "You start to [open? "closed":"open"] the vent cover...")
- playsound(src, W.usesound, 20, 1)
- if(do_after(user, 10 SECONDS * W.toolspeed))
+ playsound(src, C.usesound, 20, 1)
+ if(do_after(user, 10 SECONDS * C.toolspeed))
open = !open
to_chat(user, "You [open? "open":"close"] the cover.")
update_icon()
diff --git a/code/modules/maps/rift/atmospheres/lythios43c.dm b/code/modules/maps/rift/atmospheres/lythios43c.dm
new file mode 100644
index 00000000000..2bd7cbc5406
--- /dev/null
+++ b/code/modules/maps/rift/atmospheres/lythios43c.dm
@@ -0,0 +1,11 @@
+/datum/atmosphere/planet/lythios43c
+ base_gases = list(
+ /datum/gas/nitrogen = 0.64,
+ /datum/gas/oxygen = 0.32,
+ /datum/gas/carbon_dioxide = 0.04
+ )
+ base_target_pressure = 76.9
+ minimum_pressure = 76.9
+ maximum_pressure = 76.9
+ minimum_temp = 116.15
+ maximum_temp = 131.15
diff --git a/maps/rift/items/clothing/rft_suit.dm b/maps/rift/items/clothing/rft_suit.dm
index 5954d802109..bd6295ac44b 100644
--- a/maps/rift/items/clothing/rft_suit.dm
+++ b/maps/rift/items/clothing/rft_suit.dm
@@ -15,14 +15,8 @@
siemens_coefficient = 0.9
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 80, rad = 0)
valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_ARMOR_C)
- allowed = list(
- /obj/item/device/flashlight,
- /obj/item/weapon/gun,
- /obj/item/ammo_magazine,
- /obj/item/weapon/melee,
- /obj/item/weapon/material/knife,
- /obj/item/weapon/tank,
- /obj/item/device/radio,
- /obj/item/weapon/pickaxe,
- /obj/item/weapon/gun/projectile/sec/flash
- )
\ No newline at end of file
+ allowed = list (/obj/item/gun,/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical,
+ /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,
+ /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
diff --git a/maps/rift/items/weapons/rft_weapons.dm b/maps/rift/items/weapons/rft_weapons.dm
index 37ab89fcba6..4821d551aeb 100644
--- a/maps/rift/items/weapons/rft_weapons.dm
+++ b/maps/rift/items/weapons/rft_weapons.dm
@@ -1,5 +1,6 @@
// Pathfinder's machete
+/*
/obj/item/weapon/melee/energy/machete
name = "energy machete"
desc = "Light, concealable and especially favoured for artic survival, it features a sleek, robust design. While stylish, it is not the most practical and it somehow manages to look and feel like a toy. Features a telescoping energy emitter designed to be collapsed for storage."
@@ -49,3 +50,4 @@
playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1)
return 1
return 0
+*/
\ No newline at end of file
diff --git a/maps/rift/rift-01-underground2.dmm b/maps/rift/rift-01-underground2.dmm
index 165256a1d24..201623ce78f 100644
--- a/maps/rift/rift-01-underground2.dmm
+++ b/maps/rift/rift-01-underground2.dmm
@@ -1,4 +1,4 @@
-"aa" = (/turf/simulated/icerock,/area/rift/surfacebase/underground/under2)
+"aa" = (/turf/simulated/mineral/icerock/,/area/rift/surfacebase/underground/under2)
"ab" = (/turf/simulated/wall/r_wall,/area/crew_quarters/panic_shelter)
"ac" = (/turf/simulated/shuttle/wall/voidcraft,/area/turbolift/runder/level2)
"ad" = (/obj/structure/lift/panel,/turf/simulated/shuttle/wall/voidcraft,/area/turbolift/runder/level2)
@@ -18,7 +18,7 @@
"ar" = (/turf/simulated/wall/r_wall,/area/engineering/engine_room)
"as" = (/obj/structure/table/reinforced,/obj/structure/flora/pottedplant/stoutbush{pixel_y = 14},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"at" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/structure/cable{d2 = 2; dir = 2; icon_state = "0-2"},/obj/machinery/power/breakerbox/activated,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"au" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/electrical,/obj/machinery/power/terminal{icon_state = "term"; dir = 4},/obj/structure/cable{d2 = 2; dir = 2; icon_state = "0-2"},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"au" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/structure/table/rack,/obj/item/storage/toolbox/electrical,/obj/machinery/power/terminal{icon_state = "term"; dir = 4},/obj/structure/cable{d2 = 2; dir = 2; icon_state = "0-2"},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"av" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/engineering/engine_room)
"aw" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1450; icon_state = "map_injector"; id = "waste_out"; name = "Waste Gas Injector"; pixel_y = 0; power_rating = 30000; use_power = 1; volume_rate = 700},/turf/simulated/floor/plating,/area/engineering/engine_room)
"ax" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 8},/obj/machinery/door/airlock/maintenance/engi{name = "SMES Access"; req_one_access = null},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
@@ -42,7 +42,7 @@
"aP" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"aQ" = (/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 1},/obj/machinery/atmospherics/pipe/simple/visible/black{icon_state = "intact"; dir = 5},/obj/structure/railing{icon_state = "railing0"; dir = 1},/turf/simulated/floor/plating,/area/engineering/engine_room)
"aR" = (/turf/simulated/wall/r_wall,/area/crew_quarters/sleep/maintDorm2{name = "\improper Bunker Dorm 2"})
-"aS" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm1{name = "\improper Bunker Dorm 1"})
+"aS" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm1{name = "\improper Bunker Dorm 1"})
"aT" = (/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/crew_quarters/sleep/maintDorm3{name = "\improper Bunker Dorm 3"})
"aU" = (/turf/simulated/wall/r_wall,/area/crew_quarters/sleep/maintDorm3{name = "\improper Bunker Dorm 3"})
"aV" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
@@ -146,10 +146,10 @@
"cP" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/blue,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/turf/simulated/floor/plating,/area/engineering/engine_room)
"cQ" = (/obj/machinery/atmospherics/pipe/manifold/visible/blue{icon_state = "map"; dir = 4},/turf/simulated/floor/plating,/area/engineering/engine_room)
"cR" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm1{name = "\improper Bunker Dorm 1"})
-"cS" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm2{name = "\improper Bunker Dorm 2"})
+"cS" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm2{name = "\improper Bunker Dorm 2"})
"cT" = (/obj/structure/catwalk,/obj/machinery/light/small,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"cU" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm2{name = "\improper Bunker Dorm 2"})
-"cV" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm3{name = "\improper Bunker Dorm 3"})
+"cV" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/bed/padded,/obj/item/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm3{name = "\improper Bunker Dorm 3"})
"cW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/reinforced,/area/engineering/engine_core)
"cX" = (/obj/machinery/atmospherics/pipe/simple/visible/blue{icon_state = "intact"; dir = 9},/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/turf/simulated/floor/plating,/area/engineering/engine_room)
"cY" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 6},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plating,/area/engineering/engine_room)
@@ -213,7 +213,7 @@
"ee" = (/obj/machinery/atmospherics/pipe/simple/visible/universal,/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/turf/simulated/floor/plating,/area/maintenance/atmos_control)
"ef" = (/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/atmos_control)
"eg" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/shower{pixel_y = 18},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 5},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"eh" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/tank/oxygen,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/maintenance/atmos_control)
+"eh" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/extinguisher,/obj/item/extinguisher/mini,/obj/item/tank/oxygen,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/maintenance/atmos_control)
"ei" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/maintenance/engi{name = "Elevator Shaft Access"},/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"ej" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/structure/railing,/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/turf/simulated/floor/tiled/techfloor,/area/rift/turbolift/maint)
"ek" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 10},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/maintDorm1{name = "\improper Bunker Dorm 1"})
@@ -288,7 +288,7 @@
"fB" = (/obj/structure/table/reinforced,/obj/structure/flora/pottedplant/large{pixel_y = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/turf/simulated/floor/tiled,/area/hallway/primary/undertwo)
"fC" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"fD" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/yellow/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
-"fE" = (/obj/effect/floor_decal/corner_steel_grid{icon_state = "steel_grid"; dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals_central5{icon_state = "steel_decals_central5"; dir = 1},/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/obj/item/bodybag/cryobag,/obj/random/medical,/obj/item/weapon/tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/monotile,/area/engineering/atmos)
+"fE" = (/obj/effect/floor_decal/corner_steel_grid{icon_state = "steel_grid"; dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals_central5{icon_state = "steel_decals_central5"; dir = 1},/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/item/bodybag/cryobag,/obj/random/medical,/obj/item/duct_tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/monotile,/area/engineering/atmos)
"fF" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/yellow/bordercorner2,/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"fG" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/turf/simulated/floor/tiled,/area/hallway/primary/undertwo)
"fH" = (/obj/structure/table/reinforced,/obj/structure/flora/pottedplant/fern{pixel_y = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/turf/simulated/floor/tiled,/area/hallway/primary/undertwo)
@@ -312,7 +312,7 @@
"fZ" = (/obj/machinery/door/airlock/glass_atmos,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{icon_state = "map-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/yellow/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
"ga" = (/obj/machinery/pipedispenser/disposal,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
"gb" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
-"gc" = (/obj/structure/table/reinforced,/obj/item/device/analyzer,/obj/item/device/analyzer,/obj/item/device/analyzer,/obj/item/device/analyzer,/obj/item/device/pipe_painter,/obj/item/device/pipe_painter,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
+"gc" = (/obj/structure/table/reinforced,/obj/item/analyzer,/obj/item/analyzer,/obj/item/analyzer,/obj/item/analyzer,/obj/item/pipe_painter,/obj/item/pipe_painter,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
"gd" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
"ge" = (/obj/effect/floor_decal/borderfloor,/obj/machinery/light,/obj/machinery/alarm{dir = 1; pixel_y = -24},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_one)
"gf" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/plating,/area/engineering/engine_room)
@@ -343,11 +343,11 @@
"gE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; external_pressure_bound_default = 0; frequency = 1441; icon_state = "map_vent_in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; pressure_checks = 2; pressure_checks_default = 2; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/nitrogen,/area/engineering/atmos)
"gF" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "map_injector"; id = "air_in"; use_power = 1},/turf/simulated/floor/reinforced/airmix,/area/engineering/atmos)
"gG" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/reinforced/airmix,/area/engineering/atmos)
-"gH" = (/turf/simulated/icerock,/area/engineering/engine_room)
+"gH" = (/turf/simulated/mineral/icerock/,/area/engineering/engine_room)
"gI" = (/obj/structure/table/reinforced,/obj/machinery/computer/cryopod/robot,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/techfloor,/area/shuttle/cryo)
"gJ" = (/turf/simulated/wall/r_wall,/area/shuttle/cryo)
"gK" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/structure/closet/firecloset/full,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"gL" = (/obj/structure/table/rack,/obj/item/weapon/storage/firstaid/regular,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/camera/network/civilian,/obj/item/device/radio,/obj/item/device/radio,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"gL" = (/obj/structure/table/rack,/obj/item/storage/firstaid/regular,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/camera/network/civilian,/obj/item/radio,/obj/item/radio,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"gM" = (/obj/structure/table/rack,/obj/random/firstaid,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/item/roller,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"gN" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/structure/cable{d1 = 1; d2 = 4; dir = 2; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"gO" = (/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/turf/simulated/floor/tiled/techfloor,/area/shuttle/cryo)
@@ -359,7 +359,7 @@
"gU" = (/turf/simulated/floor/reinforced/phoron,/area/engineering/atmos)
"gV" = (/obj/machinery/portable_atmospherics/canister/phoron,/turf/simulated/floor/reinforced/phoron,/area/engineering/atmos)
"gW" = (/turf/simulated/floor/reinforced/n20,/area/engineering/atmos)
-"gX" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/reinforced/n20,/area/engineering/atmos)
+"gX" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/reinforced/n20,/area/engineering/atmos)
"gY" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/atmos)
"gZ" = (/obj/machinery/pipelayer,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
"ha" = (/obj/structure/sign/department/engine{pixel_y = -32},/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -392,7 +392,7 @@
"hB" = (/obj/machinery/atmospherics/pipe/simple/visible/blue{icon_state = "intact"; dir = 8},/obj/effect/floor_decal/industrial/danger,/obj/structure/railing,/turf/simulated/floor/plating,/area/engineering/engine_room)
"hC" = (/obj/machinery/atmospherics/pipe/simple/visible/blue{icon_state = "intact"; dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/black,/obj/effect/floor_decal/industrial/danger,/obj/structure/railing,/turf/simulated/floor/plating,/area/engineering/engine_room)
"hD" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 5},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/plating,/area/engineering/engine_room)
-"hE" = (/obj/structure/table/reinforced,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/obj/item/device/t_scanner,/obj/item/stack/cable_coil,/obj/fiftyspawner/rods,/obj/fiftyspawner/rglass,/obj/fiftyspawner/steel,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
+"hE" = (/obj/structure/table/reinforced,/obj/item/t_scanner,/obj/item/t_scanner,/obj/item/t_scanner,/obj/item/t_scanner,/obj/item/stack/cable_coil,/obj/fiftyspawner/rods,/obj/fiftyspawner/rglass,/obj/fiftyspawner/steel,/turf/simulated/floor/tiled/techmaint,/area/engineering/atmos)
"hF" = (/obj/structure/window/reinforced/full,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/atmos)
"hG" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 10},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/engineering/atmos)
"hH" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 6},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 2},/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_one)
@@ -515,9 +515,9 @@
"jU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"jV" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"jW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
-"jX" = (/obj/machinery/firealarm{dir = 8; icon_state = "fire0"; pixel_x = 24},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"jX" = (/obj/machinery/firealarm{dir = 8; icon_state = "fire0"; pixel_x = 24},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/structure/bed/padded,/obj/item/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"jY" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
-"jZ" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/structure/closet/emcloset,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"jZ" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 5},/obj/structure/closet/emcloset,/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/obj/item/tank/emergency/oxygen/engi,/obj/item/tank/emergency/oxygen/engi,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"ka" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos)
"kb" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"kc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 10},/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -545,7 +545,7 @@
"ky" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/railing,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"kz" = (/obj/structure/closet/crate,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"kA" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
-"kB" = (/turf/simulated/icerock,/area/maintenance/lower/atmos)
+"kB" = (/turf/simulated/mineral/icerock/,/area/maintenance/lower/atmos)
"kC" = (/obj/effect/overlay/snow/floor/surround,/obj/effect/overlay/snow/floor,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"kD" = (/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"kE" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/supply{icon_state = "intact-supply"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -564,7 +564,7 @@
"kR" = (/obj/machinery/computer/security/engineering{icon_state = "computer"; dir = 4},/turf/simulated/floor/tiled/steel_ridged,/area/engineering/atmos)
"kS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/binary/pump{dir = 1},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/yellow/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
"kT" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{icon_state = "map_universal"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"kU" = (/obj/structure/table/reinforced,/obj/item/weapon/hand_labeler,/obj/item/weapon/pen/blue,/obj/item/weapon/folder/yellow,/obj/item/weapon/paper_bin,/obj/item/taperoll/atmos,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/device/t_scanner,/turf/simulated/floor/tiled/monofloor,/area/engineering/atmos)
+"kU" = (/obj/structure/table/reinforced,/obj/item/hand_labeler,/obj/item/pen/blue,/obj/item/folder/yellow,/obj/item/paper_bin,/obj/item/barrier_tape_roll/atmos,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/t_scanner,/turf/simulated/floor/tiled/monofloor,/area/engineering/atmos)
"kV" = (/obj/machinery/camera/network/engineering,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/yellow/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
"kW" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/undertwo)
"kX" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 5},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{icon_state = "intact-scrubbers"; dir = 5},/turf/simulated/floor/plating,/area/engineering/engine_room)
@@ -658,10 +658,10 @@
"mH" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 8},/obj/structure/table/rack,/obj/random/tool/powermaint,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mI" = (/obj/structure/railing,/obj/structure/closet/firecloset/full,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mJ" = (/obj/structure/railing,/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
-"mK" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/tank/oxygen,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
+"mK" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/extinguisher,/obj/item/extinguisher/mini,/obj/item/tank/oxygen,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mL" = (/obj/structure/railing,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mM" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
-"mN" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"mN" = (/obj/structure/table/reinforced,/obj/item/storage/pill_bottle/dice,/obj/item/deck/cards,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"mO" = (/obj/machinery/portable_atmospherics/powered/scrubber,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mP" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/lower/atmos{name = "\improper Central Atmospherics Maintenance"})
"mQ" = (/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/effect/floor_decal/techfloor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
@@ -766,13 +766,13 @@
"oL" = (/obj/structure/railing,/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/maintenance/lower/atmos)
"oM" = (/obj/machinery/atmospherics/pipe/simple/visible/black,/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/random/mob/mouse,/turf/simulated/floor/plating,/area/maintenance/engi_engine)
"oN" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"oO" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 6},/obj/structure/closet/crate/medical,/obj/item/device/defib_kit/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag,/obj/item/bodybag,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"oO" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 6},/obj/structure/closet/crate/medical,/obj/item/defib_kit/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag,/obj/item/bodybag,/obj/item/healthanalyzer,/obj/item/healthanalyzer,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"oP" = (/obj/structure/grille,/obj/structure/window/phoronreinforced/full{icon_state = "phoronwindow0"},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 2},/obj/machinery/door/blast/shutters{dir = 2; icon_state = "shutter1"; id = "bunker"},/turf/simulated/floor/plating,/area/crew_quarters/panic_shelter)
"oQ" = (/obj/machinery/door/airlock/glass_atmos,/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/borderfloor,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/atmos)
"oR" = (/obj/effect/floor_decal/techfloor,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"oS" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/shuttle/cryo)
"oT" = (/obj/machinery/cryopod{icon_state = "cryopod_0"; dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/shuttle/cryo)
-"oU" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"oU" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"oV" = (/obj/structure/grille,/obj/structure/window/phoronreinforced/full{icon_state = "phoronwindow0"},/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 4},/obj/machinery/door/blast/shutters{dir = 4; icon_state = "shutter1"; id = "bunker"},/turf/simulated/floor/plating,/area/crew_quarters/panic_shelter)
"oW" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"oX" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/door/airlock/hatch{name = "Bunker Hatch"; req_one_access = null},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
@@ -811,7 +811,7 @@
"pE" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"pF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/yellow/border{icon_state = "bordercolor"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/atmos)
"pG" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/machinery/camera/network/civilian,/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_one)
-"pH" = (/obj/structure/sign/directions/cryo{dir = 4; icon_state = "direction_cry"; pixel_x = 32},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"pH" = (/obj/structure/sign/directions/cryo{dir = 4; icon_state = "direction_cry"; pixel_x = 32},/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 4},/obj/structure/bed/padded,/obj/item/bedsheet,/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"pI" = (/obj/structure/catwalk,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rift/station/stairs_one)
"pJ" = (/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/yellow/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/yellow/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d2 = 8; dir = 2; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/engineering/atmos)
"pK" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/machinery/camera/network/civilian,/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_one)
@@ -857,7 +857,7 @@
"qy" = (/obj/machinery/atmospherics/binary/pump{dir = 1},/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/engineering/atmos)
"qz" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled/monotile,/area/engineering/atmos)
"qA" = (/obj/effect/floor_decal/techfloor,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
-"qB" = (/obj/structure/table/rack,/obj/structure/bedsheetbin,/obj/item/weapon/storage/fancy/candle_box,/obj/effect/floor_decal/techfloor,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
+"qB" = (/obj/structure/table/rack,/obj/structure/bedsheetbin,/obj/item/storage/fancy/candle_box,/obj/effect/floor_decal/techfloor,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/panic_shelter)
"qC" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/turf/simulated/floor/tiled/steel,/area/hallway/primary/undertwo)
"qD" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/engineering/atmos)
"qE" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/engineering/atmos)
diff --git a/maps/rift/rift-02-underground1.dmm b/maps/rift/rift-02-underground1.dmm
index b2e4455b99f..3a8f447d154 100644
--- a/maps/rift/rift-02-underground1.dmm
+++ b/maps/rift/rift-02-underground1.dmm
@@ -1,7 +1,7 @@
-"aa" = (/turf/simulated/icerock,/area/rift/surfacebase/underground/under1)
+"aa" = (/turf/simulated/mineral/icerock/,/area/rift/surfacebase/underground/under1)
"ab" = (/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
"ac" = (/obj/effect/landmark/start,/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
-"ad" = (/obj/item/weapon/pickaxe,/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
+"ad" = (/obj/item/pickaxe,/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
"ae" = (/turf/simulated/wall,/area/rift/station/stairs_two)
"af" = (/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"ag" = (/turf/simulated/open,/area/rift/station/stairs_two)
@@ -86,7 +86,7 @@
"bH" = (/obj/machinery/atmospherics/binary/pump{icon_state = "map_off"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"bI" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/machinery/firealarm{dir = 8; icon_state = "fire0"; pixel_x = 24},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 8},/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_two)
"bJ" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_two)
-"bK" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/effect/decal/cleanable/spiderling_remains,/obj/structure/table/rack,/obj/item/weapon/pickaxe/drill{desc = "Go get it."; name = "thermal drill"},/obj/item/weapon/pickaxe/hand,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Fore Engineering Maintenance"})
+"bK" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/effect/decal/cleanable/spiderling_remains,/obj/structure/table/rack,/obj/item/pickaxe/drill{desc = "Go get it."; name = "thermal drill"},/obj/item/pickaxe/hand,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Fore Engineering Maintenance"})
"bL" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Fore Engineering Maintenance"})
"bM" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/table/rack,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Fore Engineering Maintenance"})
"bN" = (/obj/structure/toilet,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
@@ -201,9 +201,9 @@
"dS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
"dT" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"dU" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"dV" = (/obj/structure/table/steel_reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/item/weapon/book/manual/atmospipes{pixel_x = -4; pixel_y = -4},/obj/item/weapon/book/manual/engineering_construction{pixel_x = 4; pixel_y = 4},/obj/item/weapon/book/manual/engineering_guide,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
+"dV" = (/obj/structure/table/steel_reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/item/book/manual/atmospipes{pixel_x = -4; pixel_y = -4},/obj/item/book/manual/engineering_construction{pixel_x = 4; pixel_y = 4},/obj/item/book/manual/engineering_guide,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"dW" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/computer/atmoscontrol,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
-"dX" = (/obj/structure/table/steel_reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/item/weapon/storage/box/nifsofts_engineering,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
+"dX" = (/obj/structure/table/steel_reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/item/storage/box/nifsofts_engineering,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"dY" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/computer/security/engineering,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"dZ" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"ea" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
@@ -218,8 +218,8 @@
"ej" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"ek" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 1},/obj/machinery/recharge_station,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"el" = (/obj/structure/bed/chair/office/dark{icon_state = "officechair_dark"; dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engineering_monitoring)
-"em" = (/obj/machinery/button/remote/blast_door{id = 2; name = "Engine monitoring room blast door control"; pixel_x = -5; pixel_y = 5; step_y = 0},/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 1; step_y = -10},/obj/machinery/button/remote/blast_door{id = "stair_engine_blast"; name = "Stairwell blast door control"; pixel_x = -5; pixel_y = -5},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = "sme_core_access"; name = "Supermatter core access control"; pixel_x = 5; pixel_y = -5; step_y = 0},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = 1; name = "Supermatter core blast door control"; pixel_x = 5; pixel_y = 5; step_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engineering_monitoring)
-"en" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 4},/obj/item/weapon/paper_bin,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
+"em" = (/obj/machinery/button/remote/blast_door{id = 2; name = "Engine monitoring room blast door control"; pixel_x = -5; pixel_y = 5; step_y = 0},/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{icon_state = "intercom"; dir = 1; step_y = -10},/obj/machinery/button/remote/blast_door{id = "stair_engine_blast"; name = "Stairwell blast door control"; pixel_x = -5; pixel_y = -5},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = "sme_core_access"; name = "Supermatter core access control"; pixel_x = 5; pixel_y = -5; step_y = 0},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = 1; name = "Supermatter core blast door control"; pixel_x = 5; pixel_y = 5; step_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engineering_monitoring)
+"en" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 4},/obj/item/paper_bin,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"eo" = (/obj/effect/floor_decal/borderfloor/corner,/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/underone)
"ep" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"eq" = (/obj/effect/floor_decal/borderfloor/cee,/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
@@ -238,7 +238,7 @@
"eD" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/structure/bed/chair/sofa/right{icon_state = "chair_preview"; dir = 8},/obj/machinery/computer/timeclock/premade/east,/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"eE" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/engine_smes)
"eF" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/radiation{anchored = 1},/obj/structure/sign/signnew/memetic{pixel_x = -32},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"eG" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 8},/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/evaguide{pixel_x = -2; pixel_y = -2},/obj/item/weapon/book/manual/supermatter_engine{pixel_x = 2; pixel_y = 2; step_x = 0; step_y = 0},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
+"eG" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 8},/obj/structure/table/steel_reinforced,/obj/item/book/manual/evaguide{pixel_x = -2; pixel_y = -2},/obj/item/book/manual/supermatter_engine{pixel_x = 2; pixel_y = 2; step_x = 0; step_y = 0},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"eH" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/tiled/steel_grid,/area/engineering/engineering_monitoring)
"eI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
"eJ" = (/obj/effect/floor_decal/borderfloor/corner,/obj/structure/table/steel_reinforced,/obj/item/toy/figure/engineer,/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
@@ -251,7 +251,7 @@
"eQ" = (/obj/machinery/power/grid_checker,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/cable,/turf/simulated/floor/plating,/area/engineering/engine_smes)
"eR" = (/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/structure/catwalk,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/engineering)
"eS" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"eT" = (/obj/structure/table/reinforced,/obj/item/clothing/gloves/yellow,/obj/item/device/multitool,/obj/item/stack/cable_coil,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/engineering/engine_smes)
+"eT" = (/obj/structure/table/reinforced,/obj/item/clothing/gloves/yellow,/obj/item/multitool,/obj/item/stack/cable_coil,/obj/item/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/engineering/engine_smes)
"eU" = (/obj/structure/closet/radiation{anchored = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/structure/sign/signnew/radiation{pixel_x = -32},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"eV" = (/obj/structure/sign/department/engine,/turf/simulated/wall/r_wall,/area/engineering/engineering_monitoring)
"eW" = (/obj/structure/table/steel_reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/item/clothing/glasses/meson{pixel_x = -3; pixel_y = 3; step_x = 0; step_y = 0},/obj/item/clothing/glasses/meson{pixel_x = -2; pixel_y = 2; step_x = 0; step_y = 0},/obj/item/clothing/glasses/meson{pixel_x = -1; pixel_y = 1; step_x = 0; step_y = 0},/obj/item/clothing/glasses/meson{step_x = 0; step_y = 0},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
@@ -265,7 +265,7 @@
"fe" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/engineering)
"ff" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/underone)
"fg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engineering_monitoring)
-"fh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/snakesnackbox,/obj/item/device/megaphone,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"fh" = (/obj/structure/table/reinforced,/obj/item/storage/box/snakesnackbox,/obj/item/megaphone,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"fi" = (/turf/simulated/wall,/area/engineering/lower/atmos_lockers)
"fj" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/engineering_hallway)
"fk" = (/obj/structure/catwalk,/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/maintenance/substation/engineering)
@@ -275,9 +275,9 @@
"fo" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/hallway/secondary/engineering_hallway)
"fp" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/engine_core)
"fq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
-"fr" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 8},/obj/item/weapon/paper_bin,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"fr" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 8},/obj/item/paper_bin,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fs" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 8},/obj/effect/floor_decal/borderfloorblack/corner,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"ft" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/door/window{icon_state = "left"; dir = 1},/obj/item/weapon/folder/yellow,/obj/item/weapon/pen/red,/obj/item/weapon/pen/blue,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"ft" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/door/window{icon_state = "left"; dir = 1},/obj/item/folder/yellow,/obj/item/pen/red,/obj/item/pen/blue,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fu" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
"fv" = (/obj/machinery/door/airlock/engineeringatmos,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{dir = 2; icon_state = "shutter1"; id = "sme_core_access"; name = "Supermatter core access shutters"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"fw" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/engine_smes)
@@ -291,10 +291,10 @@
"fE" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"fF" = (/obj/machinery/computer/power_monitor{icon_state = "computer"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/machinery/light,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/engineering/engineering_monitoring)
"fG" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/computer/atmoscontrol/laptop,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
-"fH" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/door/window/northright,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"fH" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/machinery/door/window/northright,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fI" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 9},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"fJ" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"fK" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 4},/obj/item/weapon/tape_roll,/obj/item/weapon/clipboard,/obj/item/taperoll/engineering,/obj/item/taperoll/atmos,/obj/machinery/door/firedoor/glass/hidden,/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"fK" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 4},/obj/item/duct_tape_roll,/obj/item/clipboard,/obj/item/barrier_tape_roll/engineering,/obj/item/barrier_tape_roll/atmos,/obj/machinery/door/firedoor/glass/hidden,/turf/simulated/floor/tiled/monotile,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fL" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fM" = (/obj/structure/extinguisher_cabinet{dir = 8; icon_state = "extinguisher_closed"; pixel_x = 30},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/structure/bed/chair/sofa/left{icon_state = "chair_preview"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"fN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
@@ -315,7 +315,7 @@
"gc" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"gd" = (/obj/machinery/door/airlock/maintenance/common,/obj/machinery/door/firedoor/glass,/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/substation/engineering)
"ge" = (/obj/structure/bed/chair/office/light{icon_state = "officechair_white"; dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer{name = "\improper Engineering Lobby"})
-"gf" = (/obj/structure/table/reinforced,/obj/random/medical,/obj/item/weapon/storage/firstaid/regular,/obj/item/bodybag/cryobag,/turf/simulated/floor/tiled/monofloor,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"gf" = (/obj/structure/table/reinforced,/obj/random/medical,/obj/item/storage/firstaid/regular,/obj/item/bodybag/cryobag,/turf/simulated/floor/tiled/monofloor,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"gg" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass/hidden,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"gh" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"gi" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Fore Engineering Maintenance"})
@@ -331,7 +331,7 @@
"gs" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/machinery/requests_console/preset/engineering{pixel_y = 32},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"gt" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"gu" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"gv" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"gv" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"gw" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"gx" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/machinery/door/airlock,/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"gy" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
@@ -386,7 +386,7 @@
"hv" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 10},/obj/machinery/power/sensor{name = "Engine - Powernet Sensor"; name_tag = "Engine output"},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/cyan{d2 = 4; icon_state = "0-4"},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/engine_smes)
"hw" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/engine_smes)
"hx" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 8},/obj/structure/cable/cyan,/turf/simulated/floor/plating,/area/engineering/engine_smes)
-"hy" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/engineering/engine_smes)
+"hy" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/cell/high,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/engineering/engine_smes)
"hz" = (/obj/effect/floor_decal/borderfloorblack/corner,/obj/effect/floor_decal/corner/orange/bordercorner,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"hA" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/engineering/engine_smes)
"hB" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 6},/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer{name = "\improper Engineering Lobby"})
@@ -436,7 +436,7 @@
"it" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"iu" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/radiation{anchored = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/sign/signnew/memetic{pixel_x = 32},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"iv" = (/obj/structure/closet/crate/engineering,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/storage)
-"iw" = (/obj/structure/closet/crate,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/smes_coil,/obj/item/weapon/smes_coil/super_capacity,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/smes_coil/super_capacity,/obj/item/weapon/smes_coil,/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/storage)
+"iw" = (/obj/structure/closet/crate,/obj/item/circuitboard/smes,/obj/item/circuitboard/smes,/obj/item/smes_coil,/obj/item/smes_coil/super_capacity,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/smes_coil/super_capacity,/obj/item/smes_coil,/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/storage)
"ix" = (/obj/machinery/power/port_gen/pacman,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/storage)
"iy" = (/obj/machinery/floodlight,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/engineering/storage)
"iz" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
@@ -527,7 +527,7 @@
"kg" = (/obj/structure/loot_pile/maint/trash,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/substation/engineering)
"kh" = (/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/structure/bed/chair/sofa/right{icon_state = "chair_preview"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"ki" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/camera/network/engine{icon_state = "camera"; dir = 5},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
-"kj" = (/obj/structure/closet/secure_closet/atmos_personal,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kj" = (/obj/structure/closet/secure_closet/atmos_personal,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/storage/backpack/dufflebag/eng,/obj/item/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kk" = (/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kl" = (/turf/simulated/wall,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"km" = (/obj/effect/floor_decal/corner_techfloor_grid{icon_state = "corner_techfloor_grid"; dir = 8},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 8},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
@@ -536,44 +536,44 @@
"kp" = (/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"kq" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/photocopier/faxmachine{department = "Engineering"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"kr" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"ks" = (/obj/effect/overlay/snow/floor/pointy,/turf/simulated/icerock/floor/lythios43c,/area/rift/surfacebase/underground/under1)
-"kt" = (/turf/simulated/icerock/floor/lythios43c,/area/rift/surfacebase/underground/under1)
-"ku" = (/obj/structure/table/reinforced,/obj/item/device/universal_translator,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
+"ks" = (/obj/effect/overlay/snow/floor/pointy,/turf/simulated/mineral/icerock/floor/lythios43c,/area/rift/surfacebase/underground/under1)
+"kt" = (/turf/simulated/mineral/icerock/floor/lythios43c,/area/rift/surfacebase/underground/under1)
+"ku" = (/obj/structure/table/reinforced,/obj/item/universal_translator,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"kv" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"kw" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"kx" = (/obj/machinery/vending/engivend,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"ky" = (/obj/machinery/vending/tool,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kz" = (/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kA" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kA" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kB" = (/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kC" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kC" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"kE" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/closet/firecloset/full,/turf/simulated/floor/plating,/area/maintenance/substation/engineering)
"kF" = (/obj/effect/floor_decal/techfloor/orange,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"kG" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 8},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"kH" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"kI" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
-"kJ" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/analyzer,/obj/item/device/analyzer,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kK" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/tank/oxygen,/obj/machinery/door/window,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kL" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kI" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/toxin,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
+"kJ" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/storage/toolbox/mechanical,/obj/item/storage/toolbox/mechanical,/obj/item/duct_tape_roll,/obj/item/duct_tape_roll,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/multitool,/obj/item/multitool,/obj/item/multitool,/obj/item/multitool,/obj/item/analyzer,/obj/item/analyzer,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kK" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/tank/oxygen,/obj/machinery/door/window,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kL" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kM" = (/obj/structure/table/reinforced,/obj/machinery/microwave,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"kN" = (/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"kO" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/engineering_personal,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"kP" = (/obj/structure/closet/secure_closet/atmos_personal,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kO" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/engineering_personal,/obj/item/storage/backpack/dufflebag/eng,/obj/item/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"kP" = (/obj/structure/closet/secure_closet/atmos_personal,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/storage/backpack/dufflebag/eng,/obj/item/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kQ" = (/obj/effect/floor_decal/borderfloorblack,/obj/structure/closet/fireaxecabinet{dir = 1; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kR" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"kS" = (/obj/effect/floor_decal/borderfloorblack,/obj/structure/sign/warning/nosmoking_2{pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kT" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/door/firedoor/glass/hidden,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"kU" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kV" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/item/weapon/tank/oxygen,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kV" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/item/tank/oxygen,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kW" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kX" = (/obj/machinery/light,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 4},/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"kY" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/structure/table/rack/shelf/steel,/obj/structure/window/reinforced,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/rig/eva/equipped,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"kY" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/structure/table/rack/shelf/steel,/obj/structure/window/reinforced,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/rig/eva/equipped,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"kZ" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"la" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"lb" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/transit/orange,/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"lc" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 4},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"ld" = (/obj/structure/table/reinforced,/obj/item/weapon/pen,/obj/item/weapon/folder/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
+"ld" = (/obj/structure/table/reinforced,/obj/item/pen,/obj/item/folder/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"le" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/corner_techfloor_grid{icon_state = "corner_techfloor_grid"; dir = 8},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"lf" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"lg" = (/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
@@ -628,7 +628,7 @@
"md" = (/obj/effect/floor_decal/borderfloor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 1},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/station/stairs_two)
"me" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 4},/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 6},/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"mf" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 8},/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 10},/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
-"mg" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer{name = "\improper Engineering Lobby"})
+"mg" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel_grid,/area/engineering/foyer{name = "\improper Engineering Lobby"})
"mh" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"mi" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/door/firedoor/glass/hidden,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"mj" = (/obj/structure/foamedmetal,/turf/simulated/floor/plating,/area/engineering/engine_core)
@@ -655,7 +655,7 @@
"mE" = (/obj/machinery/door/blast/regular{dir = 2; id = 1; name = "Supermatter Core Blast Door"},/obj/structure/catwalk,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/engineering/engine_core)
"mF" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 6},/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/storage)
"mG" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"mH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets{step_y = 0},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
+"mH" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets{step_y = 0},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"mI" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"mJ" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"mK" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
@@ -669,7 +669,7 @@
"mS" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/cyan{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/reinforced,/area/engineering/engine_core)
"mT" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 8},/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"mU" = (/obj/machinery/light,/obj/effect/floor_decal/borderfloorblack,/obj/machinery/power/apc/high{pixel_y = -24},/obj/effect/floor_decal/transit/orange,/obj/structure/cable/green,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
-"mV" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
+"mV" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"mW" = (/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"mX" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/open,/area/engineering/engine_core)
"mY" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced/full{icon_state = "phoronrwindow"; dir = 4},/obj/structure/cable/cyan,/turf/simulated/floor/reinforced,/area/engineering/engine_core)
@@ -682,15 +682,15 @@
"nf" = (/obj/machinery/door/blast/regular{dir = 4; id = 1; name = "Supermatter Core Blast Door"},/obj/structure/catwalk,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/engineering/engine_core)
"ng" = (/obj/structure/catwalk,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/open,/area/engineering/engine_core)
"nh" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/open,/area/engineering/engine_core)
-"ni" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"ni" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"nj" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"nk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 6},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
-"nl" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/weapon/tank/oxygen,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"nl" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/machinery/door/window/westright,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/tank/oxygen,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"nm" = (/obj/machinery/light/small,/obj/machinery/atmospherics/portables_connector{icon_state = "map_connector"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"nn" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
-"no" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/item/weapon/storage/box/lights/mixed{pixel_x = -2; pixel_y = 2},/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/lightreplacer,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"np" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"nq" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/item/weapon/storage/box/lights/mixed{pixel_x = -2; pixel_y = 2},/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/gps/explorer,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/lightreplacer,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"no" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/item/storage/box/lights/mixed{pixel_x = -2; pixel_y = 2},/obj/item/storage/box/lights/mixed,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/lightreplacer,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"np" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"nq" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/item/storage/box/lights/mixed{pixel_x = -2; pixel_y = 2},/obj/item/storage/box/lights/mixed,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/gps/explorer,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/lightreplacer,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"nr" = (/turf/simulated/wall,/area/crew_quarters/heads/chief)
"ns" = (/obj/effect/floor_decal/techfloor/orange{icon_state = "techfloororange_edges"; dir = 1},/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/engine_core)
"nt" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
@@ -700,7 +700,7 @@
"nx" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/orange/border,/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"ny" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 8},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"nz" = (/obj/effect/floor_decal/borderfloorblack/corner,/obj/effect/floor_decal/techfloor/orange/corner,/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
-"nA" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/analyzer,/obj/item/device/analyzer,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"nA" = (/obj/structure/window/reinforced{icon_state = "rwindow"; dir = 1},/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/storage/toolbox/mechanical,/obj/item/storage/toolbox/mechanical,/obj/item/duct_tape_roll,/obj/item/duct_tape_roll,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/multitool,/obj/item/multitool,/obj/item/multitool,/obj/item/multitool,/obj/item/analyzer,/obj/item/analyzer,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"nB" = (/obj/structure/sign/warning/secure_area{pixel_y = -32},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/transit/orange,/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"nC" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 1},/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"nD" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
@@ -709,9 +709,9 @@
"nG" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/corner/orange/border,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"nH" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 9},/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"nI" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"nJ" = (/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = 3; name = "Atmospherics blast door control"; pixel_x = -5; pixel_y = 32; step_y = 0},/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/item/weapon/phone,/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 4},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = "sme_core_access"; name = "Supermatter core access control"; pixel_x = 5; pixel_y = 32; step_y = 0},/turf/simulated/floor/tiled/dark,/area/engineering/break_room)
+"nJ" = (/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = 3; name = "Atmospherics blast door control"; pixel_x = -5; pixel_y = 32; step_y = 0},/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/item/phone,/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 4},/obj/machinery/button/remote/blast_door{icon_rotation = 180; id = "sme_core_access"; name = "Supermatter core access control"; pixel_x = 5; pixel_y = 32; step_y = 0},/turf/simulated/floor/tiled/dark,/area/engineering/break_room)
"nK" = (/obj/structure/closet/radiation{anchored = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/structure/sign/signnew/radiation{pixel_x = 32},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 5},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"nL" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/engineering/break_room)
+"nL" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/machinery/power/apc/high{dir = 1; pixel_y = 24},/obj/item/flashlight/lamp,/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/engineering/break_room)
"nM" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"nN" = (/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"nO" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
@@ -722,21 +722,21 @@
"nT" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/requests_console/preset/ce{pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"nU" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/lower/atmos_lockers)
"nV" = (/obj/structure/bed/chair/office/light{icon_state = "officechair_white"; dir = 4},/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
-"nW" = (/obj/structure/table/rack/shelf/steel,/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -2; pixel_y = 2; step_x = 0; step_y = 0},/obj/item/weapon/storage/briefcase/inflatable{step_x = 0; step_y = 0},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 2; pixel_y = -2},/obj/item/taperoll/atmos,/obj/item/taperoll/atmos,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
-"nX" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp/ce,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
+"nW" = (/obj/structure/table/rack/shelf/steel,/obj/item/storage/briefcase/inflatable{pixel_x = -2; pixel_y = 2; step_x = 0; step_y = 0},/obj/item/storage/briefcase/inflatable{step_x = 0; step_y = 0},/obj/item/storage/briefcase/inflatable{pixel_x = 2; pixel_y = -2},/obj/item/barrier_tape_roll/atmos,/obj/item/barrier_tape_roll/atmos,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"nX" = (/obj/structure/table/reinforced,/obj/item/stamp/ce,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"nY" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/obj/machinery/light,/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"nZ" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"oa" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"ob" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 8},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"oc" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/techfloor/orange/corner{icon_state = "techfloororange_corners"; dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/engineering/break_room)
"od" = (/obj/effect/floor_decal/borderfloorblack,/obj/structure/sign/warning/nosmoking_2{pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"oe" = (/obj/structure/table/rack/shelf/steel,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"oe" = (/obj/structure/table/rack/shelf/steel,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/machinery/door/window,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"of" = (/obj/effect/floor_decal/borderfloorblack,/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"og" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/engineering_personal,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"og" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/engineering_personal,/obj/item/storage/backpack/dufflebag/eng,/obj/item/pickaxe/drill,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"oh" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 8},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 8},/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oi" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills{icon_state = "laptop"; dir = 1},/obj/machinery/button/windowtint{id = "ce_office"; pixel_x = 14; pixel_y = 8},/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
-"oj" = (/obj/structure/table/rack/shelf/steel,/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -2; pixel_y = 2; step_x = 0; step_y = 0},/obj/item/weapon/storage/briefcase/inflatable{step_x = 0; step_y = 0},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 2; pixel_y = -2},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"ok" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow_ce{pixel_x = -2; pixel_y = -4; step_x = 0; step_y = 0},/obj/item/weapon/paper_bin{pixel_y = 5},/obj/item/weapon/pen,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
+"oj" = (/obj/structure/table/rack/shelf/steel,/obj/item/storage/briefcase/inflatable{pixel_x = -2; pixel_y = 2; step_x = 0; step_y = 0},/obj/item/storage/briefcase/inflatable{step_x = 0; step_y = 0},/obj/item/storage/briefcase/inflatable{pixel_x = 2; pixel_y = -2},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/barrier_tape_roll/engineering,/obj/item/barrier_tape_roll/engineering,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"ok" = (/obj/structure/table/reinforced,/obj/item/folder/yellow_ce{pixel_x = -2; pixel_y = -4; step_x = 0; step_y = 0},/obj/item/paper_bin{pixel_y = 5},/obj/item/pen,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"ol" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/chief)
"om" = (/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief)
"on" = (/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/transit/orange,/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
@@ -756,15 +756,15 @@
"oB" = (/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/storage)
"oC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/firealarm{dir = 8; icon_state = "fire0"; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/storage)
"oD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/storage)
-"oE" = (/obj/structure/table/rack,/obj/item/weapon/rig/ce/equipped,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window,/obj/item/clothing/glasses/welding/superior,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/item/weapon/pickaxe/jackhammer,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"oE" = (/obj/structure/table/rack,/obj/item/rig/ce/equipped,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window,/obj/item/clothing/glasses/welding/superior,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 9},/obj/item/pickaxe/jackhammer,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oF" = (/obj/machinery/telecomms/relay/preset/rift/under_shallow,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief)
"oG" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/item/clothing/glasses/meson,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oH" = (/obj/machinery/door/airlock/engineeringatmos,/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/atmos/storage)
"oI" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oJ" = (/obj/machinery/door/airlock/engineeringatmos,/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/engineering/storage)
-"oK" = (/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/item/weapon/rcd/advanced/loaded,/obj/item/weapon/rcd_ammo/large{pixel_x = 2; pixel_y = 2},/obj/item/weapon/rcd_ammo/large,/obj/structure/table/rack,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"oK" = (/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/item/rcd/advanced/loaded,/obj/item/rcd_ammo/large{pixel_x = 2; pixel_y = 2},/obj/item/rcd_ammo/large,/obj/structure/table/rack,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oL" = (/obj/machinery/telecomms/relay/preset/rift/under_deep,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/heads/chief)
-"oM" = (/obj/item/weapon/bedsheet/cedouble,/obj/structure/bed/double/padded,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"oM" = (/obj/item/bedsheet/cedouble,/obj/structure/bed/double/padded,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oN" = (/obj/structure/loot_pile/maint/trash,/obj/structure/railing{icon_state = "railing0"; dir = 8},/obj/structure/railing{icon_state = "railing0"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/engineering)
"oO" = (/obj/effect/floor_decal/borderfloorblack,/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"oP" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/structure/sign/warning/compressed_gas{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
@@ -804,10 +804,10 @@
"px" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"py" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pz" = (/obj/structure/lift/panel,/turf/simulated/shuttle/wall/voidcraft,/area/turbolift/runder/level1)
-"pA" = (/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
+"pA" = (/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/storage/toolbox/electrical,/obj/item/storage/toolbox/electrical,/obj/item/duct_tape_roll,/obj/item/duct_tape_roll,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/dark,/area/engineering/lower/atmos_lockers)
"pB" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pC" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"pD" = (/obj/structure/table/rack/shelf/steel,/obj/structure/window/reinforced,/obj/item/weapon/rig/eva/equipped,/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"pD" = (/obj/structure/table/rack/shelf/steel,/obj/structure/window/reinforced,/obj/item/rig/eva/equipped,/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 10},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"pE" = (/obj/structure/railing{icon_state = "railing0"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"pF" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pG" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/structure/sign/warning/nosmoking_2{pixel_y = 32},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{icon_state = "map-scrubbers"; dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{icon_state = "map-supply"; dir = 1},/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
@@ -817,8 +817,8 @@
"pK" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pL" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/corner/orange/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pM" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
-"pN" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/shoes/magboots,/obj/item/device/suit_cooling_unit,/obj/item/weapon/tank/oxygen,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
-"pO" = (/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/weldpack,/obj/item/weapon/weldpack,/obj/item/weapon/weldingtool/largetank,/obj/item/weapon/weldingtool/largetank,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"pN" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/shoes/magboots,/obj/item/suit_cooling_unit,/obj/item/tank/oxygen,/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/machinery/door/window/westright{icon_state = "right"; dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/head/helmet/space/void/engineering,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
+"pO" = (/obj/structure/table/rack/shelf/steel,/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/storage/toolbox/electrical,/obj/item/storage/toolbox/electrical,/obj/item/duct_tape_roll,/obj/item/duct_tape_roll,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/weldpack,/obj/item/weldpack,/obj/item/weldingtool/largetank,/obj/item/weldingtool/largetank,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/turf/simulated/floor/tiled/dark,/area/engineering/locker_room)
"pP" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 1},/obj/structure/sign/securearea{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 4},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
"pQ" = (/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/obj/effect/overlay/snow/floor/pointy,/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
"pR" = (/obj/effect/floor_decal/borderfloorblack/corner,/obj/effect/floor_decal/techfloor/orange/corner,/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/hallway)
@@ -910,10 +910,10 @@
"rz" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 6},/obj/effect/floor_decal/transit/orange{icon_state = "transit_techfloororange_edges"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 9},/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 8},/obj/machinery/papershredder,/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/monitoring)
"rA" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/transit/orange,/obj/machinery/camera/network/engine{icon_state = "camera"; dir = 1},/turf/simulated/floor/tiled/dark,/area/engineering/engine_core)
"rB" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/machinery/power/breakerbox/activated,/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/substation/engineering)
-"rC" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
+"rC" = (/obj/structure/table/rack,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"rD" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 5},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply"; dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers"; dir = 10},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway)
"rE" = (/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
-"rF" = (/obj/structure/table/rack,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/suit/fire/firefighter,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
+"rF" = (/obj/structure/table/rack,/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/suit/fire/firefighter,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"rG" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -24},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/canister/empty,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"rH" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/panic_shelter)
"rI" = (/obj/machinery/door/airlock/glass_engineeringatmos,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/corner/orange/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/hallway/secondary/engineering_hallway)
@@ -951,8 +951,8 @@
"so" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/structure/bed/chair/sofa/corner{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/tiled/steel,/area/hallway/primary/underone)
"sp" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized/full{id = "ce_office"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/window/reinforced/polarized/full{dir = 1; icon_state = "fwindow"; id = "ce_office"},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief)
"sq" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized/full{id = "ce_office"},/obj/structure/window/reinforced/polarized/full{dir = 1; icon_state = "fwindow"; id = "ce_office"},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief)
-"sr" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/supermatter_engine,/obj/item/device/radio,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
-"ss" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/item/clothing/glasses/omnihud/eng,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"sr" = (/obj/structure/table/reinforced,/obj/item/book/manual/supermatter_engine,/obj/item/radio,/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
+"ss" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/structure/disposalpipe/segment{icon_state = "pipe-s"; dir = 8},/obj/item/clothing/glasses/omnihud/eng,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"st" = (/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"su" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
"sv" = (/obj/effect/floor_decal/borderfloorblack{icon_state = "borderfloor_black"; dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/chief)
@@ -975,7 +975,7 @@
"sM" = (/obj/structure/railing{icon_state = "railing0"; dir = 8},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"sN" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"sO" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet/crate,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
-"sP" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet,/obj/item/weapon/flamethrower,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas/wwii,/obj/random/contraband,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
+"sP" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet,/obj/item/flamethrower,/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas/wwii,/obj/random/contraband,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"sQ" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"sR" = (/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Starboard Engineering Maintenance"})
"sS" = (/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/turf/simulated/floor/plating,/area/rift/surfacebase/underground/under1)
diff --git a/maps/rift/rift-03-surface1.dmm b/maps/rift/rift-03-surface1.dmm
index 9656ff3b6d3..3896c48efb3 100644
--- a/maps/rift/rift-03-surface1.dmm
+++ b/maps/rift/rift-03-surface1.dmm
@@ -38,7 +38,7 @@
"aL" = (/obj/structure/disposalpipe/sortjunction{dir = 4; icon_state = "pipe-j1s"; name = "Robotics"; sortType = "Robotics"},/turf/simulated/floor/outdoors/snow/lythios43c,/area/rift/surfacebase/outside/outside1)
"aM" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/outdoors/snow/lythios43c,/area/rift/surfacebase/outside/outside1)
"aN" = (/turf/simulated/wall,/area/rift/surfacebase/outside/outside1)
-"aO" = (/turf/simulated/icerock,/area/rift/surfacebase/outside/outside1)
+"aO" = (/turf/simulated/mineral/icerock/,/area/rift/surfacebase/outside/outside1)
"aP" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/outdoors/snow/lythios43c,/area/rift/surfacebase/outside/outside1)
"aQ" = (/turf/simulated/wall,/area/maintenance/cargo)
"aR" = (/turf/simulated/wall,/area/maintenance/central_heating/surface_one)
@@ -47,7 +47,7 @@
"aU" = (/obj/structure/railing,/obj/structure/table/rack,/obj/random/tool,/obj/random/maintenance,/turf/simulated/floor/plating,/area/maintenance/cargo)
"aV" = (/obj/structure/railing,/turf/simulated/floor/plating,/area/maintenance/cargo)
"aW" = (/obj/structure/railing,/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/cargo)
-"aX" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/random/maintenance,/obj/random/maintenance,/obj/random/tool,/turf/simulated/floor/plating,/area/maintenance/cargo)
+"aX" = (/obj/structure/table/rack,/obj/item/extinguisher,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/obj/random/maintenance,/obj/random/maintenance,/obj/random/tool,/turf/simulated/floor/plating,/area/maintenance/cargo)
"aY" = (/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside1)
"aZ" = (/turf/simulated/wall/r_wall,/area/rift/surfacebase/outside/outside1)
"ba" = (/obj/machinery/vending/fitness,/turf/simulated/floor/tiled/steel_ridged,/area/hallway/primary/surfaceone)
@@ -110,56 +110,56 @@
"cf" = (/obj/structure/cable{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/railing,/obj/structure/cable{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/substation/surface_one)
"cg" = (/obj/machinery/power/breakerbox/activated,/obj/structure/cable,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/substation/surface_one)
"ch" = (/obj/machinery/door/firedoor/glass,/obj/structure/lattice,/obj/structure/cable{d1 = 32; d2 = 1; dir = 2; icon_state = "32-1"},/obj/structure/cable,/turf/simulated/open,/area/maintenance/substation/surface_one)
-"ci" = (/turf/simulated/icerock,/area/maintenance/maint_bar)
+"ci" = (/turf/simulated/mineral/icerock/,/area/maintenance/maint_bar)
"cj" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor/voidcraft/dark,/area/rift/surfacebase/outside/outside1)
"ck" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor/voidcraft/light,/area/rift/surfacebase/outside/outside1)
"cl" = (/obj/effect/overlay/snow/floor,/obj/effect/overlay/snow/floor/edges,/obj/effect/overlay/snow/floor/surround{icon_state = "snow_surround"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cm" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
-"cn" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 5},/turf/simulated/icerock/floor,/area/maintenance/maint_bar)
-"co" = (/turf/simulated/icerock/floor,/area/maintenance/maint_bar)
-"cp" = (/obj/structure/girder,/turf/simulated/icerock/floor,/area/maintenance/maint_bar)
-"cq" = (/obj/structure/table/rack/shelf,/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/item/weapon/gun/projectile/automatic/wt550/lethal,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/machinery/recharger/wallcharger{pixel_x = 32; pixel_y = 5},/obj/machinery/recharger/wallcharger{pixel_x = 32; pixel_y = -5},/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/ammo_magazine/s357,/obj/item/ammo_magazine/s357,/turf/simulated/floor/tiled/steel_grid,/area/rift/surfacebase/security/armory)
+"cn" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 5},/turf/simulated/mineral/icerock/floor,/area/maintenance/maint_bar)
+"co" = (/turf/simulated/mineral/icerock/floor,/area/maintenance/maint_bar)
+"cp" = (/obj/structure/girder,/turf/simulated/mineral/icerock/floor,/area/maintenance/maint_bar)
+"cq" = (/obj/structure/table/rack/shelf,/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/item/gun/projectile/automatic/wt550/lethal,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/item/storage/box/shotgunshells,/obj/item/storage/box/stunshells,/obj/item/storage/box/shotgunammo,/obj/item/gun/projectile/shotgun/pump/combat,/obj/machinery/recharger/wallcharger{pixel_x = 32; pixel_y = 5},/obj/machinery/recharger/wallcharger{pixel_x = 32; pixel_y = -5},/obj/item/gun/projectile/revolver/mateba,/obj/item/gun/projectile/revolver/mateba,/obj/item/ammo_magazine/s357,/obj/item/ammo_magazine/s357,/turf/simulated/floor/tiled/steel_grid,/area/rift/surfacebase/security/armory)
"cr" = (/obj/machinery/computer/security,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"cs" = (/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/icerock/floor,/area/maintenance/maint_bar)
+"cs" = (/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/mineral/icerock/floor,/area/maintenance/maint_bar)
"ct" = (/turf/simulated/wall,/area/maintenance/maint_bar)
"cu" = (/obj/effect/overlay/snow/floor,/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 5},/turf/simulated/floor/plating,/area/maintenance/maint_bar)
-"cv" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 10},/obj/effect/overlay/snow/floor/pointy,/turf/simulated/icerock/floor,/area/maintenance/maint_bar)
+"cv" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 10},/obj/effect/overlay/snow/floor/pointy,/turf/simulated/mineral/icerock/floor,/area/maintenance/maint_bar)
"cw" = (/obj/structure/kitchenspike,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"cx" = (/obj/structure/kitchenspike,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cy" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cz" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 10},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 10},/obj/machinery/computer/secure_data,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"cA" = (/turf/simulated/wall/r_wall,/area/rift/surfacebase/security/armory)
"cB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/rift/surfacebase/security/armory)
-"cC" = (/obj/effect/floor_decal/rust,/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
-"cD" = (/obj/effect/floor_decal/rust,/obj/item/weapon/tape_roll,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
-"cE" = (/obj/effect/floor_decal/rust,/obj/structure/bed,/obj/item/weapon/handcuffs/cable,/obj/item/clothing/mask/muzzle,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
+"cC" = (/obj/effect/floor_decal/rust,/obj/item/tank/anesthetic,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
+"cD" = (/obj/effect/floor_decal/rust,/obj/item/duct_tape_roll,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
+"cE" = (/obj/effect/floor_decal/rust,/obj/structure/bed,/obj/item/handcuffs/cable,/obj/item/clothing/mask/muzzle,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cF" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"cG" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cH" = (/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/obj/effect/overlay/snow/floor/pointy,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cI" = (/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
-"cJ" = (/obj/machinery/button/remote/airlock{name = "Surface One Armory access"; pixel_y = 24; req_one_access = list(3); specialfunctions = 4},/obj/item/device/radio/intercom/department/security{dir = 1; icon_state = "secintercom"; pixel_y = 34},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
+"cJ" = (/obj/machinery/button/remote/airlock{name = "Surface One Armory access"; pixel_y = 24; req_one_access = list(3); specialfunctions = 4},/obj/item/radio/intercom/department/security{dir = 1; icon_state = "secintercom"; pixel_y = 34},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"cK" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/door/airlock/security,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "sfc_check_shutter"; name = "Surface Checkpoint Shutter"; opacity = 0},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"cL" = (/obj/item/weapon/material/shard,/obj/random/trash,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"cL" = (/obj/item/material/shard,/obj/random/trash,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"cM" = (/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"cN" = (/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cO" = (/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cP" = (/obj/effect/floor_decal/rust,/obj/item/clothing/mask/breath/emergency,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cQ" = (/obj/effect/floor_decal/industrial/halfstair,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cR" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/halfstair,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
-"cS" = (/obj/item/weapon/stool,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"cS" = (/obj/item/stool,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"cT" = (/turf/simulated/wall,/area/quartermaster/warehouse)
"cU" = (/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"cV" = (/obj/effect/floor_decal/rust,/obj/item/weapon/stool,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
+"cV" = (/obj/effect/floor_decal/rust,/obj/item/stool,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cW" = (/obj/effect/floor_decal/rust,/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cX" = (/obj/structure/bed/chair/office/light{icon_state = "officechair_white"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/security/checkpoint)
"cY" = (/obj/effect/floor_decal/rust,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/plating,/area/maintenance/maint_bar)
"cZ" = (/obj/structure/table/wooden_reinforced,/obj/item/trash/plate,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"da" = (/obj/structure/table/wooden_reinforced,/obj/item/trash/dipbowl,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
-"db" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"db" = (/obj/structure/table/wooden_reinforced,/obj/item/reagent_containers/food/drinks/drinkingglass,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"dc" = (/obj/structure/table/wooden_reinforced,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"dd" = (/turf/simulated/wall/r_wall,/area/rift/surfacebase/security/checkpoint)
"de" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/security/checkpoint)
-"df" = (/obj/structure/table/rack,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/alcohol,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"df" = (/obj/structure/table/rack,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/alcohol,/obj/item/material/shard,/obj/item/material/shard,/obj/item/material/shard,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"dg" = (/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/security/checkpoint)
"dh" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"di" = (/obj/structure/disposalpipe/trunk{icon_state = "pipe-t"; dir = 1},/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/obj/structure/cable/green,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 8},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 8},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
@@ -168,9 +168,9 @@
"dl" = (/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"dm" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
"dn" = (/turf/simulated/wall,/area/rift/surfacebase/security/checkpoint)
-"do" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/obj/item/device/radio,/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"dp" = (/obj/random/trash,/obj/item/weapon/material/shard,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
-"dq" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/item/weapon/reagent_containers/food/drinks/shaker{pixel_x = 8},/obj/random/cash,/obj/random/contraband,/obj/random/contraband,/obj/item/weapon/gun/projectile/derringer{ammo_type = /obj/item/ammo_casing/a9mm; caliber = "9mm"; desc = "It's not size of your gun that matters, just the size of your load. Uses 9mm rounds."; name = "derringer 9mm"; projectile_type = /obj/item/projectile/bullet/pistol},/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"do" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/item/radio,/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
+"dp" = (/obj/random/trash,/obj/item/material/shard,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
+"dq" = (/obj/structure/table/wooden_reinforced,/obj/item/reagent_containers/food/drinks/flask/barflask,/obj/item/reagent_containers/food/drinks/shaker{pixel_x = 8},/obj/random/cash,/obj/random/contraband,/obj/random/contraband,/obj/item/gun/projectile/derringer{ammo_type = /obj/item/ammo_casing/a9mm; caliber = "9mm"; desc = "It's not size of your gun that matters, just the size of your load. Uses 9mm rounds."; name = "derringer 9mm"; projectile_type = /obj/item/projectile/bullet/pistol},/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"dr" = (/obj/structure/table/wooden_reinforced,/obj/machinery/power/apc/alarms_hidden{chargelevel = 0; chargemode = 0; dir = 1; pixel_y = -24; req_access = null},/obj/machinery/chemical_dispenser/bar_alc/full{icon_state = "booze_dispenser"; dir = 1},/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"ds" = (/obj/structure/table/wooden_reinforced,/obj/machinery/chemical_dispenser/bar_soft/full{icon_state = "soda_dispenser"; dir = 1},/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
"dt" = (/obj/machinery/light_construct/small,/turf/simulated/floor/holofloor/wood,/area/maintenance/maint_bar)
@@ -180,7 +180,7 @@
"dx" = (/obj/structure/railing,/turf/simulated/floor/outdoors/snow/lythios43c,/area/rift/surfacebase/outside/outside1)
"dy" = (/turf/simulated/wall/r_wall,/area/maintenance/evahallway)
"dz" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"dA" = (/obj/machinery/requests_console/preset/security{department = "Surface Security"; pixel_y = -32},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 6},/obj/structure/table/reinforced,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = 2},/obj/machinery/recharger,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
+"dA" = (/obj/machinery/requests_console/preset/security{department = "Surface Security"; pixel_y = -32},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 6},/obj/structure/table/reinforced,/obj/item/cell,/obj/item/cell{pixel_x = -2; pixel_y = 2},/obj/machinery/recharger,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"dB" = (/obj/machinery/atmospherics/pipe/manifold/visible{icon_state = "map"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"dC" = (/obj/effect/floor_decal/industrial/halfstair{icon_state = "halfstair"; dir = 4},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside1)
"dD" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/effect/overlay/snow/floor/surround{icon_state = "snow_surround"; dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/rift/surfacebase/outside/outside1)
@@ -238,13 +238,13 @@
"eD" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/machinery/light/small{icon_state = "bulb1"; dir = 8},/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
"eE" = (/obj/structure/railing,/obj/machinery/light/small{icon_state = "bulb1"; dir = 8},/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
"eF" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/random/maintenance/engineering,/obj/random/maintenance,/obj/random/tool,/obj/structure/table/rack,/obj/random/toolbox,/turf/simulated/floor/plating,/area/maintenance/tool_storage)
-"eG" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = 2},/obj/item/weapon/book/manual/evaguide,/obj/item/device/radio,/obj/item/device/radio,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
-"eH" = (/obj/structure/table/reinforced,/obj/item/weapon/tape_roll,/obj/item/weapon/storage/toolbox/electrical,/obj/item/device/t_scanner,/obj/item/stack/cable_coil,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eG" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = 2},/obj/item/book/manual/evaguide,/obj/item/radio,/obj/item/radio,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"eH" = (/obj/structure/table/reinforced,/obj/item/duct_tape_roll,/obj/item/storage/toolbox/electrical,/obj/item/t_scanner,/obj/item/stack/cable_coil,/turf/simulated/floor/tiled/steel,/area/storage/tools)
"eI" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside1)
-"eJ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/tape_roll,/obj/item/device/multitool,/obj/item/stack/cable_coil,/obj/item/clothing/gloves/fyellow,/obj/item/device/flashlight,/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"eK" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/tape_roll,/obj/item/device/multitool,/obj/item/device/t_scanner,/obj/item/device/analyzer,/obj/item/stack/cable_coil,/obj/item/clothing/gloves/fyellow,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"eL" = (/obj/structure/table/reinforced,/obj/item/weapon/tape_roll,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/device/t_scanner,/obj/item/device/analyzer,/obj/item/stack/cable_coil,/obj/item/device/flashlight/maglight,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"eM" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"eJ" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/electrical,/obj/item/duct_tape_roll,/obj/item/multitool,/obj/item/stack/cable_coil,/obj/item/clothing/gloves/fyellow,/obj/item/flashlight,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eK" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/mechanical,/obj/item/duct_tape_roll,/obj/item/multitool,/obj/item/t_scanner,/obj/item/analyzer,/obj/item/stack/cable_coil,/obj/item/clothing/gloves/fyellow,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eL" = (/obj/structure/table/reinforced,/obj/item/duct_tape_roll,/obj/item/storage/toolbox/mechanical,/obj/item/t_scanner,/obj/item/analyzer,/obj/item/stack/cable_coil,/obj/item/flashlight/maglight,/obj/random/toolbox,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eM" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"eN" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/turf/simulated/floor/tiled/steel,/area/storage/tools)
"eO" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 9},/obj/structure/flora/pottedplant/shoot,/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"eP" = (/obj/structure/reagent_dispensers/watertank,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 5},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/power/apc{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled/steel,/area/storage/tools)
@@ -254,15 +254,15 @@
"eT" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"eU" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"eV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{icon_state = "intact"; dir = 4},/obj/machinery/light,/turf/simulated/floor/plating,/area/rift/surfaceeva)
-"eW" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/tape_roll,/obj/item/device/multitool,/obj/item/clothing/gloves/fyellow,/obj/item/clothing/gloves/fyellow,/obj/item/device/flashlight,/obj/machinery/light,/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"eX" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/device/t_scanner,/obj/item/device/analyzer,/obj/item/clothing/gloves/fyellow,/obj/item/clothing/gloves/fyellow,/obj/item/device/flashlight,/obj/machinery/light,/obj/structure/extinguisher_cabinet{desc = "A small wall mounted cabinet designed to hold a fire extinguisher. "; dir = 2; pixel_y = -32},/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eW" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/duct_tape_roll,/obj/item/multitool,/obj/item/clothing/gloves/fyellow,/obj/item/clothing/gloves/fyellow,/obj/item/flashlight,/obj/machinery/light,/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"eX" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/t_scanner,/obj/item/analyzer,/obj/item/clothing/gloves/fyellow,/obj/item/clothing/gloves/fyellow,/obj/item/flashlight,/obj/machinery/light,/obj/structure/extinguisher_cabinet{desc = "A small wall mounted cabinet designed to hold a fire extinguisher. "; dir = 2; pixel_y = -32},/turf/simulated/floor/tiled/steel,/area/storage/tools)
"eY" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Airlock"; req_one_access = list(31)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"eZ" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cargo_line_shutter"; name = "Cargo Line shutter"; opacity = 0},/obj/structure/window/reinforced/polarized/full{id = "cargo_lobby"},/turf/simulated/floor/plating,/area/quartermaster/delivery)
"fa" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cargo_line_shutter"; name = "Cargo Line shutter"; opacity = 0},/obj/structure/window/reinforced/polarized/full{id = "cargo_lobby"},/turf/simulated/floor/plating,/area/quartermaster/office)
"fb" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/door/window/southright,/obj/machinery/door/window/northleft,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cargo_line_shutter"; name = "Cargo Line shutter"; opacity = 0},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"fc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cargo_line_shutter"; name = "Cargo Line shutter"; opacity = 0},/turf/simulated/floor/plating,/area/quartermaster/office)
-"fd" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 10},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 10},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
-"fe" = (/obj/structure/sign/department/mail{pixel_x = -32},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -24},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
+"fd" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/structure/table/standard,/obj/item/paper_bin,/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 10},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 10},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
+"fe" = (/obj/structure/sign/department/mail{pixel_x = -32},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/standard,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/destTagger,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -24},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"ff" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"fg" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"fh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
@@ -272,7 +272,7 @@
"fl" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/brown/bordercorner2,/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/structure/bed/chair/sofa/right{icon_state = "chair_preview"; dir = 1},/obj/structure/cable/green,/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"fm" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/structure/bed/chair/sofa/left{icon_state = "chair_preview"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"fn" = (/obj/machinery/computer/station_alert/security,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
-"fo" = (/obj/structure/sign/department/armory{pixel_y = 32},/obj/item/weapon/book/manual/security_space_law,/obj/structure/table/reinforced,/obj/machinery/camera/network/security{icon_state = "camera"; dir = 6},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 5},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 5},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/obj/machinery/button/remote/blast_door{id = "sfc_check_shutter_alt"; name = "Surface checkpoint shutter control"; pixel_x = 24; pixel_y = 0; req_one_access = list(1)},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
+"fo" = (/obj/structure/sign/department/armory{pixel_y = 32},/obj/item/book/manual/security_space_law,/obj/structure/table/reinforced,/obj/machinery/camera/network/security{icon_state = "camera"; dir = 6},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 5},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 5},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/obj/effect/floor_decal/corner/red/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/obj/machinery/button/remote/blast_door{id = "sfc_check_shutter_alt"; name = "Surface checkpoint shutter control"; pixel_x = 24; pixel_y = 0; req_one_access = list(1)},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"fp" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"fq" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"fr" = (/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -284,7 +284,7 @@
"fx" = (/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
"fy" = (/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
"fz" = (/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
-"fA" = (/mob/living/simple_animal/fennec{name = "Noodle"},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
+"fA" = (/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"fB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
"fC" = (/obj/structure/cable/green{d2 = 8; dir = 2; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
"fD" = (/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
@@ -294,8 +294,8 @@
"fH" = (/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/rift/surfacebase/outside/outside1)
"fI" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/obj/structure/foamedmetal,/turf/simulated/floor/plating,/area/rift/surfacebase/security/armory)
"fJ" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/status_display/supply_display{pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"fK" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/obj/item/device/flashlight/lamp{on = 0; pixel_x = -4},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
-"fL" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard{pixel_x = 2},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
+"fK" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/obj/item/flashlight/lamp{on = 0; pixel_x = -4},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
+"fL" = (/obj/structure/table/reinforced,/obj/item/clipboard{pixel_x = 2},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"fM" = (/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 10},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 10},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"fN" = (/obj/structure/disposalpipe/tagger/partial{name = "partial tagger - Sorting Office"; sort_tag = "Sorting Office"},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/maintenance/cargo)
"fO" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/cargo)
@@ -324,7 +324,7 @@
"hm" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/light/small{icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"hn" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/evahallway)
"ho" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
-"hp" = (/obj/structure/table/rack/shelf,/obj/item/weapon/ore/phoron{pixel_x = 2; pixel_y = 4},/obj/item/weapon/ore/phoron,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
+"hp" = (/obj/structure/table/rack/shelf,/obj/item/ore/phoron{pixel_x = 2; pixel_y = 4},/obj/item/ore/phoron,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
"hq" = (/obj/machinery/conveyor{dir = 4; icon_state = "conveyor0"; tag = "cargoshuttle"},/obj/structure/railing,/turf/simulated/floor/plating,/area/hallway/secondary/cargo_hallway)
"hr" = (/obj/machinery/atmospherics/pipe/manifold/visible{icon_state = "map"; dir = 8},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"hs" = (/turf/simulated/wall/r_wall,/area/rift/surfaceeva/cargodock)
@@ -368,7 +368,7 @@
"ii" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"ij" = (/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"ik" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/internals,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
-"il" = (/obj/structure/table/rack/shelf,/obj/item/weapon/cell,/obj/item/weapon/module/power_control,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
+"il" = (/obj/structure/table/rack/shelf,/obj/item/cell,/obj/item/module/power_control,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
"im" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/flora/ausbushes/genericbush,/turf/simulated/floor/grass,/area/hallway/primary/surfaceone)
"in" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{icon_state = "intact"; dir = 6},/turf/simulated/floor/plating,/area/rift/surfaceeva)
"io" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/reinforced,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
@@ -422,17 +422,17 @@
"jl" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jm" = (/obj/structure/table/wooden_reinforced,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jn" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
-"jo" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/folder,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
+"jo" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/secondary/cargo_hallway)
"jq" = (/obj/machinery/button/remote/blast_door{id = "warehouse"; name = "Warehouse door control"; pixel_x = -4; pixel_y = 24},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/secondary/cargo_hallway)
"jr" = (/obj/structure/table/rack,/obj/random/maintenance,/obj/random/maintenance,/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/disposalpipe/segment{icon_state = "pipe-c"; dir = 8},/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo)
-"js" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/weapon/pen,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
+"js" = (/obj/structure/table/wooden_reinforced,/obj/item/paper_bin,/obj/item/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/pen,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jt" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"ju" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/reinforced,/obj/machinery/microwave,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jv" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/secondary/cargo_hallway)
"jw" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/machinery/light,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"jx" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
-"jy" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
+"jy" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/storage/box/donkpockets,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jz" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/closet/crate,/obj/random/maintenance,/obj/random/maintenance,/obj/random/tool,/turf/simulated/floor/plating,/area/maintenance/cargo)
"jA" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 10},/obj/machinery/recharge_station,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jB" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/lightgrey/bordercorner2,/obj/machinery/light,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
@@ -454,7 +454,7 @@
"jR" = (/obj/machinery/door/airlock/glass_security,/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "sfc_check_shutter_alt"; name = "Surface Checkpoint Shutter"; opacity = 0},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/security/checkpoint)
"jS" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet/crate,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo)
"jT" = (/obj/machinery/disposal/deliveryChute,/obj/structure/disposalpipe/trunk{icon_state = "pipe-t"; dir = 1},/obj/machinery/conveyor{tag = "mailroom"},/turf/simulated/floor/plating,/area/quartermaster/delivery)
-"jU" = (/obj/structure/table/wooden_reinforced,/obj/item/device/universal_translator,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
+"jU" = (/obj/structure/table/wooden_reinforced,/obj/item/universal_translator,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside1)
"jV" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/maintenance/cargo)
"jW" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/evahallway)
"jX" = (/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -467,8 +467,8 @@
"ke" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/railing,/turf/simulated/floor/plating,/area/maintenance/evahallway)
"kf" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"kg" = (/obj/structure/bed/chair/office/light,/turf/simulated/floor/plating,/area/maintenance/cargo)
-"kh" = (/obj/structure/table/standard,/obj/item/weapon/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/weapon/pen,/obj/item/weapon/stamp/denied{pixel_x = -4},/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/cargo)
-"ki" = (/obj/item/weapon/paper_bin,/obj/structure/table/standard,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/cargo)
+"kh" = (/obj/structure/table/standard,/obj/item/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/pen,/obj/item/stamp/denied{pixel_x = -4},/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/cargo)
+"ki" = (/obj/item/paper_bin,/obj/structure/table/standard,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/cargo)
"kj" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/maintenance/cargo)
"kk" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"kl" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -498,10 +498,10 @@
"kK" = (/obj/structure/table/standard,/obj/machinery/photocopier/faxmachine{department = "Cargo"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kL" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kM" = (/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"kN" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"kN" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kO" = (/obj/structure/table/standard,/obj/machinery/microwave,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kP" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"kR" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donut,/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"kR" = (/obj/structure/table/reinforced,/obj/item/storage/box/donut,/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kT" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kU" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/machinery/conveyor{tag = "mailroom"},/turf/simulated/floor/plating,/area/quartermaster/delivery)
"kV" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/structure/sign/warning/moving_parts{pixel_y = 32},/obj/machinery/conveyor_switch{tag = "mailroom"},/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery)
@@ -509,25 +509,25 @@
"kY" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/machinery/papershredder,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"kZ" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/photocopier,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"la" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/autolathe,/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"lb" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/standard,/obj/machinery/status_display/supply_display{pixel_y = 32},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"lc" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/machinery/requests_console/preset/cargo{pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"lb" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/standard,/obj/machinery/status_display/supply_display{pixel_y = 32},/obj/item/hand_labeler,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"lc" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/standard,/obj/item/paper_bin,/obj/machinery/requests_console/preset/cargo{pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"ld" = (/obj/structure/filingcabinet/filingcabinet,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"le" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 9},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/reinforced/lythios43c,/area/rift/surfacebase/outside/outside1)
"lf" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner{icon_state = "bordercolorcorner"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lg" = (/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/cargo)
"lh" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"li" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"lj" = (/obj/structure/table/reinforced,/obj/item/weapon/deck/cah,/obj/item/weapon/deck/cah/black{pixel_y = 4},/obj/item/weapon/deck/cards{pixel_y = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"lj" = (/obj/structure/table/reinforced,/obj/item/deck/cah,/obj/item/deck/cah/black{pixel_y = 4},/obj/item/deck/cards{pixel_y = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lk" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"ll" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lm" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/sign/warning/caution{pixel_x = -32},/obj/machinery/conveyor{tag = "mailroom"},/turf/simulated/floor/plating,/area/quartermaster/delivery)
-"ln" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery)
+"ln" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/item/stool,/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery)
"lo" = (/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"lp" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 5},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"lq" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 10},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 10},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/machinery/computer/timeclock/premade/north,/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
"ls" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 5},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"lt" = (/obj/structure/table/reinforced,/obj/item/weapon/material/ashtray/glass,/obj/machinery/recharger,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"lt" = (/obj/structure/table/reinforced,/obj/item/material/ashtray/glass,/obj/machinery/recharger,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lu" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"lv" = (/obj/effect/floor_decal/steeldecal/steel_decals_central6,/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/machinery/button/remote/blast_door{id = "main_ext_blast"; name = "External airlock blast control"; pixel_y = 24; req_access = list(19,3)},/obj/machinery/light{brightness_color = "#6D6DFC"; dir = 1; icon_state = "tube1"; name = "blacklight fixture"},/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/security/armory)
"lw" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 10},/turf/simulated/floor/tiled/steel_grid,/area/quartermaster/delivery)
@@ -539,14 +539,14 @@
"mo" = (/obj/structure/catwalk,/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/cargo)
"mp" = (/obj/structure/catwalk,/obj/machinery/door/airlock/maintenance/cargo,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/quartermaster/office)
"mq" = (/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse)
-"mr" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
+"mr" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/hand_labeler,/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"ms" = (/obj/structure/catwalk,/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/cargo)
"mt" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/brown/bordercorner2,/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"mu" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/overlay/snow/floor/pointy,/obj/structure/railing{icon_state = "railing0"; dir = 1},/turf/simulated/floor/reinforced/lythios43c,/area/rift/surfacebase/outside/outside1)
"mv" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 6},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 6},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 6},/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"mw" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 8},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"mx" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"my" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/standard,/obj/item/weapon/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/weapon/pen,/obj/item/weapon/stamp/denied{pixel_x = -4},/obj/item/weapon/stamp{pixel_x = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
+"my" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/standard,/obj/item/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/pen,/obj/item/stamp/denied{pixel_x = -4},/obj/item/stamp{pixel_x = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"mz" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/bed/chair/office/light,/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"mA" = (/obj/machinery/computer/supplycomp/control{icon_state = "computer"; dir = 8},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 6},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 6},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 6},/obj/machinery/button/remote/blast_door{id = "cargo_line_shutter"; name = "Cargo line shutter control"; pixel_x = 24},/obj/machinery/button/windowtint{id = "cargo_lobby"; pixel_x = 24; pixel_y = 9},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
"mB" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 8},/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
@@ -589,7 +589,7 @@
"nr" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 5},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/reinforced/lythios43c,/area/rift/surfacebase/outside/outside1)
"ns" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"nt" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Airlock"; req_one_access = list(31)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
-"nu" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
+"nu" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 9},/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/pen,/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"nv" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"nw" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"nx" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 5},/obj/machinery/computer/supplycomp{icon_state = "computer"; dir = 8},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
@@ -645,9 +645,9 @@
"oD" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"oE" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"oG" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
-"oJ" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/weapon/pen,/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/qm,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
+"oJ" = (/obj/structure/table/reinforced,/obj/item/pen/red{pixel_x = -2; pixel_y = 2},/obj/item/pen,/obj/item/folder/yellow,/obj/item/stamp/qm,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"oL" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/structure/filingcabinet,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
-"oN" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/structure/table/standard,/obj/item/device/destTagger,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
+"oN" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/structure/table/standard,/obj/item/destTagger,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"oO" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/machinery/status_display/supply_display{pixel_y = -32},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"oP" = (/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; dir = 2; icon_state = "1-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/delivery)
"oQ" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 4},/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/reinforced/lythios43c,/area/rift/surfacebase/outside/outside1)
@@ -686,11 +686,11 @@
"pG" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/catwalk,/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/evahallway)
"pH" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{icon_state = "intact"; dir = 8},/obj/structure/railing,/obj/machinery/button/remote/blast_door{id = "main_ext_shutter"; name = "External airlock emergency override"; pixel_x = 24},/turf/simulated/floor/plating,/area/rift/surfaceeva)
"pI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/evahallway)
-"pJ" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window/eastleft,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"pJ" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window/eastleft,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"pK" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"pL" = (/obj/machinery/door/airlock/glass_external,/obj/machinery/door/blast/regular/open{id = "main_ext_blast"; name = "Surface External Blast Door"},/turf/simulated/floor/plating,/area/rift/surfaceeva)
-"pN" = (/obj/structure/table/reinforced,/obj/fiftyspawner/rods,/obj/item/weapon/tape_roll,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
-"pO" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"pN" = (/obj/structure/table/reinforced,/obj/fiftyspawner/rods,/obj/item/duct_tape_roll,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"pO" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/machinery/door/window/westright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"pP" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/maintenance/tool_storage)
"pQ" = (/obj/machinery/vending/assist,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/steel,/area/storage/tools)
"pU" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
@@ -698,18 +698,18 @@
"pW" = (/obj/structure/catwalk,/obj/machinery/door/airlock/maintenance/engi,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside1)
"pX" = (/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/tool_storage)
"pY" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/ladder{pixel_y = 10},/turf/simulated/floor/plating,/area/maintenance/evahallway)
-"pZ" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window/eastright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"pZ" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window/eastright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"qa" = (/obj/machinery/light,/obj/structure/extinguisher_cabinet{desc = "A small wall mounted cabinet designed to hold a fire extinguisher. "; dir = 2; pixel_y = -32},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
-"qb" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
-"qc" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window/eastright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"qb" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"qc" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window/eastright,/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"qd" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 1; icon_state = "fire0"; pixel_y = -24},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
-"qe" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 6},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
+"qe" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 4},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/door/window{icon_state = "left"; dir = 8},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath/emergency,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 6},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/steel,/area/storage/surface_eva)
"qf" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/railing,/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/evahallway)
"qg" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/railing,/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/tool_storage)
"qh" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 10},/obj/structure/flora/pottedplant/sticky{pixel_y = 8},/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"qj" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/t_scanner,/obj/item/device/flashlight/maglight,/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"qk" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/multitool,/obj/item/clothing/gloves/yellow,/turf/simulated/floor/tiled/steel,/area/storage/tools)
-"qm" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 6},/obj/machinery/cell_charger,/obj/item/weapon/cell/high,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"qj" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/radio,/obj/item/radio,/obj/item/t_scanner,/obj/item/flashlight/maglight,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"qk" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lightgrey/border,/obj/item/radio,/obj/item/radio,/obj/item/multitool,/obj/item/clothing/gloves/yellow,/turf/simulated/floor/tiled/steel,/area/storage/tools)
+"qm" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/lightgrey/border{icon_state = "bordercolor"; dir = 6},/obj/machinery/cell_charger,/obj/item/cell/high,/turf/simulated/floor/tiled/steel,/area/storage/tools)
"qn" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/structure/closet/emcloset,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/turf/simulated/floor/plating,/area/maintenance/tool_storage)
"qo" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 8; icon_state = "fire0"; pixel_x = 24},/turf/simulated/floor/plating,/area/maintenance/tool_storage)
"qp" = (/obj/structure/table/rack,/obj/random/toolbox,/obj/random/tool,/obj/random/tool,/obj/random/maintenance,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/evahallway)
@@ -759,13 +759,13 @@
"rh" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"ri" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/machinery/light/small{icon_state = "bulb1"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rj" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
-"rk" = (/obj/structure/table/standard,/obj/item/trash/plate,/obj/item/weapon/reagent_containers/food/condiment/cursed,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
+"rk" = (/obj/structure/table/standard,/obj/item/trash/plate,/obj/item/reagent_containers/food/condiment/cursed,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rl" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rm" = (/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rn" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/machinery/light_construct{icon_state = "tube-construct-stage1"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"ro" = (/obj/structure/catwalk,/turf/simulated/open,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
"rp" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
-"rq" = (/obj/structure/table/standard,/obj/item/weapon/circuitboard/microwave,/obj/item/stack/cable_coil,/obj/item/weapon/whetstone,/obj/item/weapon/material/knife,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
+"rq" = (/obj/structure/table/standard,/obj/item/circuitboard/microwave,/obj/item/stack/cable_coil,/obj/item/whetstone,/obj/item/material/knife,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rr" = (/obj/structure/frame,/obj/structure/table/standard,/turf/simulated/floor/plating,/area/maintenance/engineering{name = "Surface Engineering EVA Maintenance"})
"rs" = (/obj/structure/railing,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/obj/effect/overlay/snow/wall,/turf/simulated/floor/plating,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
"rt" = (/turf/simulated/wall/r_wall,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
@@ -876,7 +876,7 @@
"tJ" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/bed/chair/sofa/left{icon_state = "chair_preview"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 5},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"tK" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; dir = 2; icon_state = "2-4"},/turf/simulated/floor/tiled/steel_grid,/area/engineering/engine_eva{name = "\improper Engineering Surface EVA"})
"tO" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 2; dir = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/steel,/area/quartermaster/office)
-"tP" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 6},/obj/structure/closet/secure_closet/quartermaster,/obj/item/device/megaphone,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
+"tP" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/brown/border{icon_state = "bordercolor"; dir = 6},/obj/structure/closet/secure_closet/quartermaster,/obj/item/megaphone,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"tQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 9},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfaceone)
"tR" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfaceone)
"tS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; dir = 2; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 1},/obj/effect/floor_decal/corner/lightgrey/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 9},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfaceone)
@@ -917,7 +917,7 @@
"uK" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/green{d1 = 2; d2 = 8; dir = 2; icon_state = "2-8"},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"uL" = (/obj/effect/floor_decal/steeldecal/steel_decals4{icon_state = "steel_decals4"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; dir = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/quartermaster/foyer{name = "\improper Cargo Bay Lobby"})
"uM" = (/turf/simulated/wall/r_wall,/area/rift/turbolift/maint)
-"uO" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/reinforced,/obj/item/weapon/commcard/supply{pixel_x = 3},/obj/item/weapon/commcard/supply,/obj/item/weapon/coin/gold{pixel_x = -2; pixel_y = -2},/obj/item/weapon/coin/platinum{pixel_x = 2; pixel_y = 2},/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
+"uO" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/reinforced,/obj/item/commcard/supply{pixel_x = 3},/obj/item/commcard/supply,/obj/item/coin/gold{pixel_x = -2; pixel_y = -2},/obj/item/coin/platinum{pixel_x = 2; pixel_y = 2},/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/steel,/area/quartermaster/qm)
"uP" = (/obj/structure/ladder/up,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/effect/floor_decal/industrial/warning,/obj/structure/railing,/obj/machinery/firealarm{dir = 3; pixel_y = 24},/turf/simulated/floor/tiled/techfloor,/area/rift/turbolift/maint)
"uQ" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/structure/railing,/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/techfloor,/area/rift/turbolift/maint)
"uR" = (/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/structure/railing,/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable/green{d2 = 4; dir = 2; icon_state = "0-4"},/turf/simulated/floor/tiled/techfloor,/area/rift/turbolift/maint)
diff --git a/maps/rift/rift-04-surface2.dmm b/maps/rift/rift-04-surface2.dmm
index 7d7d6cecd43..03bf7ab7c3f 100644
--- a/maps/rift/rift-04-surface2.dmm
+++ b/maps/rift/rift-04-surface2.dmm
@@ -1,6 +1,6 @@
"aa" = (/turf/simulated/open/lythios43c,/area/rift/surfacebase/outside/outside2)
"ab" = (/obj/effect/landmark/map_data/lythios43c,/turf/simulated/open/lythios43c,/area/rift/surfacebase/outside/outside2)
-"ac" = (/turf/simulated/icerock,/area/rift/surfacebase/outside/outside2)
+"ac" = (/turf/simulated/mineral/icerock/,/area/rift/surfacebase/outside/outside2)
"ad" = (/turf/simulated/wall/r_wall,/area/rift/turbolift/maint)
"ae" = (/turf/simulated/wall,/area/rift/surfacebase/medical/triage)
"af" = (/obj/structure/ladder/up,/obj/effect/floor_decal/techfloor{icon_state = "techfloor_edges"; dir = 9},/obj/effect/floor_decal/industrial/warning,/obj/structure/railing,/obj/machinery/firealarm{dir = 3; pixel_y = 24},/turf/simulated/floor/tiled/techfloor,/area/rift/turbolift/maint)
@@ -29,13 +29,13 @@
"aC" = (/turf/simulated/wall,/area/hallway/primary/surfacefour)
"aD" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 9},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 9},/obj/machinery/disposal,/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"aE" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/firealarm{dir = 3; pixel_y = 24},/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"aF" = (/obj/item/weapon/arrow/rod,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 1},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
+"aF" = (/obj/item/arrow/rod,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 1},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"aG" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"aH" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rift/stairwell/primary/surfacetwo)
"aI" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"aJ" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"aK" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/closet/hydrant{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"aL" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/closet/secure_closet/medical_wall{desc = "It's a secure wall-mounted storage unit for chilled blood supplies."; name = "O- Blood Locker"; pixel_y = 32},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"aL" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/closet/secure_closet/medical_wall{desc = "It's a secure wall-mounted storage unit for chilled blood supplies."; name = "O- Blood Locker"; pixel_y = 32},/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"aM" = (/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"aN" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 10},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"aO" = (/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 2},/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
@@ -46,7 +46,7 @@
"aT" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"aU" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 8},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"aV" = (/obj/effect/floor_decal/borderfloor/corner,/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
-"aW" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/glass,/obj/machinery/requests_console/preset/medical{department = "Medical Triage Station"; pixel_y = 32},/obj/item/weapon/storage/firstaid/adv,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"aW" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/glass,/obj/machinery/requests_console/preset/medical{department = "Medical Triage Station"; pixel_y = 32},/obj/item/storage/firstaid/adv,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"aX" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/glass,/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/random/firstaid,/obj/random/firstaid,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"aY" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"aZ" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 10},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
@@ -54,13 +54,13 @@
"bb" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"bc" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"bd" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/machinery/vending/medical,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"be" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/glass,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/box/masks{pixel_x = 16},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"bf" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/glass,/obj/item/weapon/storage/box/gloves,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"be" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/structure/table/glass,/obj/item/storage/box/bodybags,/obj/item/storage/box/masks{pixel_x = 16},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"bf" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/glass,/obj/item/storage/box/gloves,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bg" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/closet/secure_closet/paramedic,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bh" = (/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
"bi" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 4},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
"bj" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
-"bk" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/glass,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{old_y = 16; pixel_y = 16},/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/device/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"bk" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/glass,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{old_y = 16; pixel_y = 16},/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bl" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/closet/secure_closet/medical1,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bm" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
"bn" = (/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 8},/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
@@ -79,7 +79,7 @@
"bA" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/machinery/door/firedoor/glass/hidden,/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"bB" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 8},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
"bC" = (/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals10{icon_state = "steel_decals10"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals5white{icon_state = "steel_decals5white"; dir = 4},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"bD" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/glass,/obj/item/wheelchair{pixel_y = 8},/obj/item/wheelchair{pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/device/sleevemate,/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"bD" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/structure/table/glass,/obj/item/wheelchair{pixel_y = 8},/obj/item/wheelchair{pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/sleevemate,/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 5},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bE" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"bF" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"bG" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
@@ -88,7 +88,7 @@
"bJ" = (/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 4},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
"bK" = (/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 8},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/triage)
"bL" = (/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"bM" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 10},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 5},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = -2; pixel_y = -2},/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"bM" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 10},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 5},/obj/item/reagent_containers/spray/cleaner{pixel_x = 2; pixel_y = 2},/obj/item/reagent_containers/spray/cleaner{pixel_x = -2; pixel_y = -2},/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bN" = (/obj/effect/floor_decal/borderfloorwhite/corner{icon_state = "borderfloorcorner_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/bordercorner{icon_state = "bordercolorcorner"; dir = 8},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bO" = (/obj/effect/floor_decal/borderfloorwhite/corner,/obj/effect/floor_decal/corner/paleblue/bordercorner,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"bP" = (/obj/effect/floor_decal/borderfloor,/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 1},/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/stairwell/primary/surfacetwo)
@@ -112,7 +112,7 @@
"ch" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 9},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 10},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"ci" = (/obj/effect/floor_decal/borderfloorwhite/corner{icon_state = "borderfloorcorner_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"cj" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"ck" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/table/glass,/obj/machinery/computer/med_data/laptop{icon_state = "laptop"; dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/item/device/radio/intercom/department/medbay{dir = 1; pixel_y = 22},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 9},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"ck" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/table/glass,/obj/machinery/computer/med_data/laptop{icon_state = "laptop"; dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 1},/obj/item/radio/intercom/department/medbay{dir = 1; pixel_y = 22},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 9},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 9},/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"cl" = (/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"cm" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloorwhite/corner2{icon_state = "borderfloorcorner2_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 10},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"cn" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 1},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals6{icon_state = "steel_decals6"; dir = 9},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
@@ -120,8 +120,8 @@
"cp" = (/obj/structure/catwalk,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"cq" = (/obj/structure/catwalk,/obj/machinery/light/small,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"cr" = (/turf/simulated/wall,/area/rift/turbolift/maint)
-"cs" = (/obj/structure/table/reinforced,/obj/item/device/mass_spectrometer/adv,/obj/item/weapon/hand_labeler,/obj/item/weapon/packageWrap,/obj/item/weapon/storage/box/pillbottles,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 5},/obj/structure/extinguisher_cabinet{dir = 8; icon_state = "extinguisher_closed"; pixel_x = 30},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"ct" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"cs" = (/obj/structure/table/reinforced,/obj/item/mass_spectrometer/adv,/obj/item/hand_labeler,/obj/item/packageWrap,/obj/item/storage/box/pillbottles,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 5},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 5},/obj/structure/extinguisher_cabinet{dir = 8; icon_state = "extinguisher_closed"; pixel_x = 30},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"ct" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"cu" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/sleep_console{icon_state = "sleeperconsole"; dir = 1},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"cv" = (/obj/effect/floor_decal/steeldecal/steel_decals_central1{icon_state = "steel_decals_central1"; dir = 4},/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/outside/outside2)
"cw" = (/obj/effect/floor_decal/steeldecal/steel_decals_central1{icon_state = "steel_decals_central1"; dir = 8},/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/outside/outside2)
@@ -148,9 +148,9 @@
"cR" = (/obj/structure/bed/chair/office/light{icon_state = "officechair_white"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{icon_state = "map_vent_out"; dir = 4},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/lobby)
"cS" = (/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/lobby)
"cT" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{icon_state = "map_scrubber_on"; dir = 8},/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/lobby)
-"cU" = (/obj/structure/bed/chair/office/light,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/item/device/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"cV" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/bed/roller,/obj/item/device/radio/intercom/department/medbay{dir = 8; icon_state = "medintercom"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
-"cW" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/sleeper,/obj/item/device/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"cU" = (/obj/structure/bed/chair/office/light,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/item/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"cV" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/bed/roller,/obj/item/radio/intercom/department/medbay{dir = 8; icon_state = "medintercom"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"cW" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/sleeper,/obj/item/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"cX" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/obj/structure/bed/chair/sofa/right{icon_state = "chair_preview"; dir = 4},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"cY" = (/obj/machinery/door/airlock,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/wood,/area/library)
"cZ" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 8},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
@@ -166,11 +166,11 @@
"dj" = (/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"dk" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/monowhite,/area/rift/surfacebase/medical/lobby)
"dl" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 8},/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/machinery/computer/crew{icon_state = "computer"; dir = 4},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 10},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"dm" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/item/weapon/paper_bin,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"dn" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/table/glass,/obj/item/weapon/backup_implanter{pixel_y = -8},/obj/item/weapon/backup_implanter,/obj/item/weapon/backup_implanter{pixel_y = 8},/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"dm" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/item/paper_bin,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"dn" = (/obj/structure/window/reinforced/full{icon_state = "fwindow"; dir = 2},/obj/structure/table/glass,/obj/item/backup_implanter{pixel_y = -8},/obj/item/backup_implanter,/obj/item/backup_implanter{pixel_y = 8},/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
"do" = (/obj/machinery/chem_master,/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"dp" = (/obj/machinery/chemical_dispenser/full,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 6},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 6},/obj/structure/sign/nosmoking_2{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
-"dq" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 10},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/reinforced,/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = -32},/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
+"dp" = (/obj/machinery/chemical_dispenser/full,/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 6},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 6},/obj/structure/sign/nosmoking_2{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
+"dq" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 10},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/reinforced,/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = -32},/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"dr" = (/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"ds" = (/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 6},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 6},/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"dt" = (/obj/machinery/firealarm{dir = 4; icon_state = "fire0"; pixel_x = -24},/obj/effect/floor_decal/borderfloorwhite{icon_state = "borderfloor_white"; dir = 8},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 8},/obj/structure/flora/pottedplant/minitree,/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/lobby)
@@ -191,9 +191,9 @@
"dI" = (/turf/simulated/wall,/area/crew_quarters/coffee_shop)
"dJ" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 8},/obj/structure/table/marble,/obj/item/toy/plushie/coffee_fox{name = "Cream"},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
"dK" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee/full,/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"dL" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/cup,/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -8; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"dM" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 4},/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/small/sugar{pixel_x = -6; pixel_y = 6},/obj/item/weapon/reagent_containers/glass/rag{pixel_y = 6},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"dN" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/barcodescanner,/turf/simulated/floor/carpet,/area/library)
+"dL" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/cup,/obj/item/reagent_containers/food/drinks/cup{pixel_x = -8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
+"dM" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 4},/obj/structure/table/marble,/obj/item/reagent_containers/food/condiment/small/sugar{pixel_x = -6; pixel_y = 6},/obj/item/reagent_containers/glass/rag{pixel_y = 6},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
+"dN" = (/obj/structure/table/wooden_reinforced,/obj/item/paper_bin,/obj/item/barcodescanner,/turf/simulated/floor/carpet,/area/library)
"dO" = (/turf/simulated/wall/r_wall,/area/crew_quarters/coffee_shop)
"dP" = (/obj/machinery/door/firedoor/glass/hidden{icon_state = "door_open"; dir = 1},/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals5{icon_state = "steel_decals5"; dir = 1},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"dQ" = (/obj/machinery/door/airlock/maintenance/common,/obj/structure/catwalk,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
@@ -210,18 +210,18 @@
"eb" = (/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"ec" = (/obj/structure/bookcase{name = "bookcase (Forbidden Knowledge)"},/turf/simulated/floor/carpet,/area/library)
"ed" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 10},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"ee" = (/obj/effect/floor_decal/spline/plain,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/cup,/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"ef" = (/obj/effect/floor_decal/spline/plain,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/small/sugar{pixel_x = -16},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
+"ee" = (/obj/effect/floor_decal/spline/plain,/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/cup,/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
+"ef" = (/obj/effect/floor_decal/spline/plain,/obj/structure/table/marble,/obj/item/reagent_containers/food/condiment/small/sugar{pixel_x = -16},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
"eg" = (/obj/machinery/bookbinder,/turf/simulated/floor/carpet,/area/library)
"eh" = (/obj/structure/window/reinforced/polarized/full{id = "library_private"},/obj/structure/grille,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/library)
"ei" = (/obj/machinery/photocopier,/turf/simulated/floor/carpet,/area/library)
"ej" = (/obj/machinery/papershredder,/turf/simulated/floor/carpet,/area/library)
-"ek" = (/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet,/area/library)
+"ek" = (/obj/structure/table/wooden_reinforced,/obj/item/flashlight/lamp,/turf/simulated/floor/carpet,/area/library)
"el" = (/turf/simulated/floor/wood,/area/library)
"em" = (/obj/machinery/librarypubliccomp,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/library)
"en" = (/obj/structure/bed/chair/sofa/right,/turf/simulated/floor/carpet/bcarpet,/area/library)
"eo" = (/obj/structure/bed/chair/sofa/corner,/turf/simulated/floor/carpet/bcarpet,/area/library)
-"ep" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/pen,/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/carpet,/area/library)
+"ep" = (/obj/structure/table/wooden_reinforced,/obj/item/pen,/obj/item/pen/red{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/carpet,/area/library)
"eq" = (/obj/structure/bed/chair/comfy/brown{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/floor/carpet,/area/library)
"er" = (/turf/simulated/floor/carpet,/area/library)
"es" = (/obj/machinery/door/morgue{icon_state = "door1"; dir = 2},/turf/simulated/floor/carpet,/area/library)
@@ -229,12 +229,12 @@
"eu" = (/obj/structure/table/wooden_reinforced,/turf/simulated/floor/carpet,/area/library)
"ev" = (/turf/simulated/floor/carpet/bcarpet,/area/library)
"ew" = (/obj/structure/bed/chair/sofa{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/library)
-"ex" = (/obj/structure/table/wooden_reinforced,/obj/item/device/camera_film,/obj/item/device/camera,/turf/simulated/floor/carpet,/area/library)
+"ex" = (/obj/structure/table/wooden_reinforced,/obj/item/camera_film,/obj/item/camera,/turf/simulated/floor/carpet,/area/library)
"ey" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 6},/turf/simulated/floor/lino,/area/crew_quarters/coffee_shop)
-"ez" = (/obj/structure/table/wooden_reinforced,/obj/item/device/taperecorder,/obj/item/device/tape,/obj/item/clothing/suit/storage/vest/press,/obj/item/device/tvcamera,/turf/simulated/floor/carpet,/area/library)
+"ez" = (/obj/structure/table/wooden_reinforced,/obj/item/tape_recorder,/obj/item/tape_recorder,/obj/item/clothing/suit/storage/vest/press,/obj/item/tvcamera,/turf/simulated/floor/carpet,/area/library)
"eA" = (/obj/structure/bed/chair/sofa/left{icon_state = "chair_preview"; dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/library)
"eB" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/carpet,/area/library)
-"eC" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/carpet,/area/library)
+"eC" = (/obj/structure/bed,/obj/item/bedsheet/brown,/turf/simulated/floor/carpet,/area/library)
"eD" = (/obj/machinery/door/window/southleft{req_access = 37},/turf/simulated/floor/carpet,/area/library)
"eE" = (/obj/structure/catwalk,/obj/machinery/door/airlock/maintenance/medical,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"eF" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/table/wooden_reinforced,/obj/structure/flora/pottedplant/bamboo{pixel_y = 12},/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
@@ -247,17 +247,17 @@
"eM" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/library)
"eN" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop)
"eO" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/library)
-"eP" = (/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/obj/item/weapon/storage/box/syringegun,/obj/structure/table/glass,/obj/item/clothing/accessory/collar/shock,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
+"eP" = (/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/obj/item/storage/box/syringegun,/obj/structure/table/glass,/obj/item/clothing/accessory/collar/shock,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"eQ" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"eR" = (/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/status_display{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/rift/surfacebase/medical/triage)
"eS" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/simulated/floor/wood,/area/library)
"eT" = (/obj/machinery/door/airlock/maintenance/common{id_tag = "maint_dungeon"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
-"eU" = (/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
+"eU" = (/obj/item/tank/anesthetic,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"eV" = (/obj/item/clothing/mask/breath/anesthetic,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"eW" = (/obj/structure/bookcase{name = "bookcase (Religious)"},/turf/simulated/floor/wood,/area/library)
"eX" = (/obj/structure/table/rack,/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"eY" = (/obj/structure/grille,/obj/structure/foamedmetal,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
-"eZ" = (/obj/machinery/button/remote/airlock{id = "maint_dungeon"; name = "remote door-control"; pixel_x = -26; pixel_y = 0; specialfunctions = 4},/obj/item/weapon/handcuffs,/obj/item/weapon/tape_roll,/obj/structure/table/glass,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
+"eZ" = (/obj/machinery/button/remote/airlock{id = "maint_dungeon"; name = "remote door-control"; pixel_x = -26; pixel_y = 0; specialfunctions = 4},/obj/item/handcuffs,/obj/item/duct_tape_roll,/obj/structure/table/glass,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"fa" = (/obj/structure/bed,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"fb" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library)
"fc" = (/obj/structure/bed/chair/comfy/black{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/library)
@@ -278,7 +278,7 @@
"fr" = (/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"fs" = (/obj/effect/floor_decal/industrial/halfstair{icon_state = "halfstair"; dir = 4},/turf/simulated/floor/tiled/steel,/area/crew_quarters/coffee_shop)
"ft" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
-"fu" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
+"fu" = (/obj/structure/table/wooden_reinforced,/obj/item/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"fv" = (/obj/structure/flora/pottedplant/flower,/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"fw" = (/obj/effect/floor_decal/industrial/halfstair{icon_state = "halfstair"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
"fx" = (/obj/structure/railing{icon_state = "railing0"; dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/coffee_shop)
@@ -301,11 +301,11 @@
"fO" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"fP" = (/turf/simulated/floor/wood,/area/rift/surfacebase/outside/outside2)
"fQ" = (/obj/effect/overlay/snow/floor,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
-"fR" = (/obj/item/weapon/arrow/rod,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
-"fS" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 10},/turf/simulated/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
-"fT" = (/obj/item/weapon/pickaxe/hand,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 1},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
-"fU" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 8},/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 4},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/turf/simulated/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
-"fV" = (/obj/effect/overlay/snow/floor/surround,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/turf/simulated/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
+"fR" = (/obj/item/arrow/rod,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
+"fS" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 10},/turf/simulated/mineral/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
+"fT" = (/obj/item/pickaxe/hand,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 1},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 8},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
+"fU" = (/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 8},/obj/effect/overlay/snow/floor/edges{icon_state = "snow_edges"; dir = 4},/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/turf/simulated/mineral/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
+"fV" = (/obj/effect/overlay/snow/floor/surround,/obj/effect/overlay/snow/floor/pointy{icon_state = "snowfloorpointy"; dir = 4},/turf/simulated/mineral/icerock/floor/lythios43c,/area/rift/surfacebase/outside/outside2)
"fW" = (/obj/machinery/alarm{desc = " "; pixel_y = 24},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"fX" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"fY" = (/obj/structure/railing{icon_state = "railing0"; dir = 8; step_x = 0; step_y = 0},/obj/structure/railing{icon_state = "railing0"; dir = 1},/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/clean,/obj/structure/table/rack,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
@@ -316,7 +316,7 @@
"gd" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"ge" = (/turf/simulated/floor/tiled/monotile,/area/rift/surfacebase/outside/outside2)
"gf" = (/turf/simulated/wall/r_wall,/area/hallway/primary/surfacefour)
-"gg" = (/obj/structure/kitchenspike,/obj/item/weapon/material/knife/hook/plasteel,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
+"gg" = (/obj/structure/kitchenspike,/obj/item/material/knife/hook/plasteel,/turf/simulated/floor/plating,/area/rift/turbolift/maint)
"gh" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northleft,/obj/machinery/door/window/southright,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"gi" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized/full{id = "robotics_outer"},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "robotics_shutter_ext"; name = "Robotics shutter"},/turf/simulated/floor/plating,/area/rift/surfacebase/outside/outside2)
"gj" = (/obj/machinery/door/airlock/glass_science,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
@@ -338,7 +338,7 @@
"gz" = (/obj/machinery/door/airlock/glass_science,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "robotics_shutter_ext"; name = "Robotics shutter"},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"gA" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/paleblue/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/computer/guestpass{dir = 8; icon_state = "guest"; pixel_x = 24},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"gB" = (/obj/machinery/cryopod/robot,/turf/simulated/floor/tiled/steel_ridged,/area/rift/surfacebase/outside/outside2)
-"gC" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"gC" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/reagent_containers/glass/beaker/sulphuric,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 9},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"gD" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/machinery/computer/guestpass{dir = 4; icon_state = "guest"; pixel_x = -24},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
"gE" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 4},/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 4},/obj/structure/table/reinforced,/obj/machinery/computer/med_data/laptop,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"gF" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/floor/tiled/steel,/area/hallway/primary/surfacefour)
@@ -364,20 +364,20 @@
"gZ" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/purple/bordercorner2,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"ha" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/purple/bordercorner,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hb" = (/obj/machinery/transhuman/resleever,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hc" = (/obj/structure/table/reinforced,/obj/item/device/defib_kit/jumper_kit/loaded,/obj/item/weapon/storage/box/bodybags{pixel_x = -2; pixel_y = -2},/obj/item/weapon/storage/box/masks,/obj/item/weapon/storage/box/gloves{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hd" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hc" = (/obj/structure/table/reinforced,/obj/item/defib_kit/jumper_kit/loaded,/obj/item/storage/box/bodybags{pixel_x = -2; pixel_y = -2},/obj/item/storage/box/masks,/obj/item/storage/box/gloves{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hd" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/surgery,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"he" = (/obj/machinery/optable{name = "Robotics Operating Table"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/machinery/oxygen_pump/anesthetic{pixel_y = -28},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hf" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hf" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 5},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 5},/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/machinery/alarm{desc = " "; pixel_y = 24},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hg" = (/obj/machinery/cryopod/robot,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/steel_ridged,/area/rift/surfacebase/outside/outside2)
"hh" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hi" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 1},/obj/item/device/radio/intercom{dir = 1; icon_state = "intercom"; pixel_x = -4; pixel_y = 24; step_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hi" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 1},/obj/item/radio/intercom{dir = 1; icon_state = "intercom"; pixel_x = -4; pixel_y = 24; step_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hj" = (/obj/effect/floor_decal/borderfloor/corner{icon_state = "borderfloorcorner"; dir = 1},/obj/effect/floor_decal/corner/purple/bordercorner{icon_state = "bordercolorcorner"; dir = 1},/obj/machinery/button/windowtint{id = "robotics_inner"; pixel_x = -22; pixel_y = 24},/obj/machinery/button/windowtint{id = "robotics_outer"; pixel_x = -22; pixel_y = 32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hk" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/obj/machinery/power/apc{dir = 3; pixel_y = -24},/turf/simulated/floor/tiled/steel_grid,/area/rift/surfacebase/outside/outside2)
"hl" = (/obj/machinery/computer/rdconsole/robotics{icon_state = "computer"; dir = 4},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 8},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 8},/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics requests console"; pixel_x = -32},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hm" = (/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/machinery/button/remote/blast_door{id = "mech_bay_ext"; name = "Mech Bay Exterior blast door-control"; pixel_y = 38},/obj/machinery/button/remote/blast_door{id = "mech_bay_int"; name = "Mech Bay Interior blast door-control"; pixel_y = 26},/obj/item/weapon/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/weapon/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/weapon/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/weapon/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/structure/closet/crate/science,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hm" = (/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/item/stack/material/plasteel,/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 1},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 1},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 1},/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 1},/obj/machinery/button/remote/blast_door{id = "mech_bay_ext"; name = "Mech Bay Exterior blast door-control"; pixel_y = 38},/obj/machinery/button/remote/blast_door{id = "mech_bay_int"; name = "Mech Bay Interior blast door-control"; pixel_y = 26},/obj/item/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/storage/firstaid{empty = 1; name = "first aid kit (empty)"},/obj/item/healthanalyzer,/obj/item/healthanalyzer,/obj/item/healthanalyzer,/obj/item/healthanalyzer,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/structure/closet/crate/science,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hn" = (/obj/machinery/door/blast/regular/open{dir = 4; id = "mech_bay_int"; name = "Mech Bay Blast Door"},/turf/simulated/floor/tiled/steel_grid,/area/rift/surfacebase/outside/outside2)
-"ho" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/rack/shelf,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/omnihud/rnd,/obj/item/clothing/glasses/omnihud/rnd,/obj/item/weapon/storage/toolbox/electrical{pixel_x = -2; pixel_y = -2},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 2},/obj/item/device/multitool,/obj/item/device/multitool,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
-"hp" = (/obj/structure/table/reinforced,/obj/item/device/mmi,/obj/item/device/mmi/digital/posibrain,/obj/item/device/robotanalyzer,/obj/item/device/robotanalyzer,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 6},/obj/item/device/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/obj/item/weapon/book/manual/robotics_cyborgs,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"ho" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 10},/obj/structure/table/rack/shelf,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/omnihud/rnd,/obj/item/clothing/glasses/omnihud/rnd,/obj/item/storage/toolbox/electrical{pixel_x = -2; pixel_y = -2},/obj/item/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 2},/obj/item/multitool,/obj/item/multitool,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
+"hp" = (/obj/structure/table/reinforced,/obj/item/mmi,/obj/item/mmi/digital/posibrain,/obj/item/robotanalyzer,/obj/item/robotanalyzer,/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 6},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 6},/obj/item/radio/intercom{dir = 4; icon_state = "intercom"; pixel_x = 22; step_y = 0},/obj/item/book/manual/robotics_cyborgs,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hq" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/machinery/power/apc{dir = 3; pixel_y = -24},/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hr" = (/obj/machinery/computer/transhuman/resleeving{icon_state = "computer"; dir = 8},/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 4},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
"hs" = (/obj/effect/floor_decal/borderfloor{icon_state = "borderfloor"; dir = 10},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 10},/obj/effect/floor_decal/borderfloor/corner2{icon_state = "borderfloorcorner2"; dir = 9},/obj/effect/floor_decal/corner/purple/bordercorner2{icon_state = "bordercolorcorner2"; dir = 9},/obj/machinery/disposal,/turf/simulated/floor/tiled/steel,/area/rift/surfacebase/outside/outside2)
diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm
index a5089bcfd71..f8d35d951f1 100644
--- a/maps/rift/rift.dm
+++ b/maps/rift/rift.dm
@@ -3,7 +3,6 @@
#include "rift_defines.dm"
#include "rift_turfs.dm"
#include "rift_things.dm"
- #include "rift_phoronlock.dm"
#include "rift_areas.dm"
#include "rift_areas2.dm"
#include "rift_shuttle_defs.dm"
diff --git a/maps/rift/rift_areas2.dm b/maps/rift/rift_areas2.dm
index 57fae776115..23c2e418176 100644
--- a/maps/rift/rift_areas2.dm
+++ b/maps/rift/rift_areas2.dm
@@ -214,10 +214,10 @@
// Mining Underdark // ???? Fix this.
/area/mine/unexplored/underdark
name = "\improper Mining Underdark"
- base_turf = /turf/simulated/icerock/floor/lythios43c
+ base_turf = /turf/simulated/mineral/icerock/floor/lythios43c
/area/mine/explored/underdark
name = "\improper Mining Underdark"
- base_turf = /turf/simulated/icerock/floor/lythios43c
+ base_turf = /turf/simulated/mineral/icerock/floor/lythios43c
// Mining outpost areas
/area/outpost/mining_main/passage
diff --git a/maps/rift/rift_defines.dm b/maps/rift/rift_defines.dm
index 569962d95df..62d14e043d4 100644
--- a/maps/rift/rift_defines.dm
+++ b/maps/rift/rift_defines.dm
@@ -1,32 +1,15 @@
//Atmosphere properties
-#define LYTHIOS43C_ONE_ATMOSPHERE 76.9 //kPa
-#define LYTHIOS43C_AVG_TEMP 116.15 //kelvin
-
-#define LYTHIOS43C_PER_N2 0.64
-#define LYTHIOS43C_PER_O2 0.32
-#define LYTHIOS43C_PER_N2O 0.00
-#define LYTHIOS43C_PER_CO2 0.04
-#define LYTHIOS43C_PER_PHORON 0.00
-
-//Math only beyond this point
-#define LYTHIOS43C_MOL_PER_TURF (LYTHIOS43C_ONE_ATMOSPHERE*CELL_VOLUME/(LYTHIOS43C_AVG_TEMP*R_IDEAL_GAS_EQUATION))
-#define LYTHIOS43C_MOL_N2 (LYTHIOS43C_MOL_PER_TURF * LYTHIOS43C_PER_N2)
-#define LYTHIOS43C_MOL_O2 (LYTHIOS43C_MOL_PER_TURF * LYTHIOS43C_PER_O2)
-#define LYTHIOS43C_MOL_N2O (LYTHIOS43C_MOL_PER_TURF * LYTHIOS43C_PER_N2O)
-#define LYTHIOS43C_MOL_CO2 (LYTHIOS43C_MOL_PER_TURF * LYTHIOS43C_PER_CO2)
-#define LYTHIOS43C_MOL_PHORON (LYTHIOS43C_MOL_PER_TURF * LYTHIOS43C_PER_PHORON)
-
-//Turfmakers
-#define LYTHIOS43C_SET_ATMOS nitrogen=LYTHIOS43C_MOL_N2;oxygen=LYTHIOS43C_MOL_O2;carbon_dioxide=LYTHIOS43C_MOL_CO2;phoron=LYTHIOS43C_MOL_PHORON;temperature=LYTHIOS43C_AVG_TEMP
-#define LYTHIOS43C_TURF_CREATE(x) x/lythios43c/nitrogen=LYTHIOS43C_MOL_N2;x/lythios43c/oxygen=LYTHIOS43C_MOL_O2;x/lythios43c/carbon_dioxide=LYTHIOS43C_MOL_CO2;x/lythios43c/phoron=LYTHIOS43C_MOL_PHORON;x/lythios43c/temperature=LYTHIOS43C_AVG_TEMP;x/lythios43c/outdoors=TRUE;x/lythios43c/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
-#define LYTHIOS43C_TURF_CREATE_UN(x) x/lythios43c/nitrogen=LYTHIOS43C_MOL_N2;x/lythios43c/oxygen=LYTHIOS43C_MOL_O2;x/lythios43c/carbon_dioxide=LYTHIOS43C_MOL_CO2;x/lythios43c/phoron=LYTHIOS43C_MOL_PHORON;x/lythios43c/temperature=LYTHIOS43C_AVG_TEMP
+#define LYTHIOS43C_SET_ATMOS initial_gas_mix = ATMOSPHERE_ID_LYTHIOS43C
+#define LYTHIOS43C_TURF_CREATE(x) x/lythios43c/initial_gas_mix = ATMOSPHERE_ID_LYTHIOS43C;x/lythios43c/outdoors=TRUE;x/lythios43c/allow_gas_overlays = FALSE
+#define LYTHIOS43C_TURF_CREATE_UN(x) x/lythios43c/initial_gas_mix=ATMOSPHERE_ID_LYTHIOS43C
//Normal map defs
#define Z_LEVEL_UNDERGROUND_DEEP 1
#define Z_LEVEL_UNDERGROUND 2
#define Z_LEVEL_SURFACE_LOW 3
#define Z_LEVEL_SURFACE_MID 4
-#define Z_LEVEL_TRANSIT 5
+#define Z_LEVEL_SURFACE_HIGH 5
+#define Z_LEVEL_TRANSIT 6
/datum/map/rift
name = "Rift"
diff --git a/maps/rift/rift_lythios-43c.dm b/maps/rift/rift_lythios-43c.dm
index c472557f6ca..d9694b0eebb 100644
--- a/maps/rift/rift_lythios-43c.dm
+++ b/maps/rift/rift_lythios-43c.dm
@@ -74,7 +74,7 @@ var/datum/planet/lythios43c/planet_lythios43c = null
if(weather_holder && weather_holder.current_weather)
weather_light_modifier = weather_holder.current_weather.light_modifier
- var/new_brightness = (Interpolate(low_brightness, high_brightness, weight = lerp_weight) ) * weather_light_modifier
+ var/new_brightness = (LERP(low_brightness, high_brightness, lerp_weight) ) * weather_light_modifier
var/new_color = null
if(weather_holder && weather_holder.current_weather && weather_holder.current_weather.light_color)
@@ -90,9 +90,9 @@ var/datum/planet/lythios43c/planet_lythios43c = null
var/high_g = high_color_list[2]
var/high_b = high_color_list[3]
- var/new_r = Interpolate(low_r, high_r, weight = lerp_weight)
- var/new_g = Interpolate(low_g, high_g, weight = lerp_weight)
- var/new_b = Interpolate(low_b, high_b, weight = lerp_weight)
+ var/new_r = LERP(low_r, high_r, lerp_weight)
+ var/new_g = LERP(low_g, high_g, lerp_weight)
+ var/new_b = LERP(low_b, high_b, lerp_weight)
new_color = rgb(new_r, new_g, new_b)
@@ -239,7 +239,11 @@ var/datum/planet/lythios43c/planet_lythios43c = null
flight_failure_modifier = 15
timer_low_bound = 2
timer_high_bound = 5
- effect_message = "The hail smacks into you!"
+ effect_message = list(
+ "Small chunks of ice clatter to the ground around you.",
+ "Little pellets of ice sweep at you seemingly from all sides.",
+ "The stream of hail thickens for a moment and temporarily obscures your vision."
+ )
transition_chances = list(
WEATHER_SNOW = 40,
@@ -251,42 +255,31 @@ var/datum/planet/lythios43c/planet_lythios43c = null
transition_messages = list(
"Ice begins to fall from the sky.",
"It begins to hail.",
- "An intense chill is felt, and chunks of ice start to fall from the sky, towards you."
+ "An intense chill washes over you as chunks of ice start to fall from the sky."
)
/datum/weather/lythios43c/hail/process_effects()
..()
- for(var/humie in human_mob_list)
- var/mob/living/carbon/human/H = humie
+ for(var/humie in living_mob_list)
+ var/mob/living/H = humie
if(H.z in holder.our_planet.expected_z_levels)
var/turf/T = get_turf(H)
if(!T.outdoors)
continue // They're indoors, so no need to pelt them with ice.
// If they have an open umbrella, it'll guard from hail
- var/obj/item/weapon/melee/umbrella/U
- if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella))
+ var/obj/item/melee/umbrella/U
+ if(istype(H.get_active_hand(), /obj/item/melee/umbrella))
U = H.get_active_hand()
- else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+ else if(istype(H.get_inactive_hand(), /obj/item/melee/umbrella))
U = H.get_inactive_hand()
if(U && U.open)
if(show_message)
- to_chat(H, "Hail patters onto your umbrella.")
+ to_chat(H, pick(effect_message))
continue
- var/target_zone = pick(BP_ALL)
- var/amount_blocked = H.run_armor_check(target_zone, "melee")
- var/amount_soaked = H.get_armor_soak(target_zone, "melee")
+//removed needless damage code that spammed the user. if they're outside on this planet, they can withstand the useless damage that was here.
- var/damage = rand(1,3)
-
- if(amount_blocked >= 30)
- continue // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
- //Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
-
- if(amount_soaked >= damage)
- continue // No need to apply damage.
-
- H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "hail")
if(show_message)
- to_chat(H, effect_message)
+ to_chat(H, pick(effect_message))
+
diff --git a/maps/rift/rift_phoronlock.dm b/maps/rift/rift_phoronlock.dm
index 60c07103aeb..8b330211599 100644
--- a/maps/rift/rift_phoronlock.dm
+++ b/maps/rift/rift_phoronlock.dm
@@ -12,7 +12,7 @@
// Srubbers: (obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary), frequency = "1379", scrub_id = "[base]_scrubber"
// Pumps: (obj/machinery/atmospherics/unary/vent_pump/high_volume), frequency = 1379 id_tag = "[base]_pump"
//
-
+/*
obj/machinery/airlock_sensor/phoron
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
@@ -288,3 +288,4 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
#undef TARGET_NONE
#undef TARGET_INOPEN
#undef TARGET_OUTOPEN
+*/
\ No newline at end of file
diff --git a/maps/rift/rift_shuttles.dm b/maps/rift/rift_shuttles.dm
index bad1d07e6ce..b191f44343c 100644
--- a/maps/rift/rift_shuttles.dm
+++ b/maps/rift/rift_shuttles.dm
@@ -15,10 +15,12 @@
name = "protoshuttle control console"
shuttle_tag = "Proto"
+/*
/obj/machinery/computer/shuttle_control/cruiser_shuttle
name = "cruiser shuttle control console"
shuttle_tag = "Cruiser Shuttle"
req_one_access = list(access_heads)
+*/
//
// "Tram" Emergency Shuttler
@@ -63,9 +65,10 @@
//
// The backup tether shuttle uses experimental engines and can degrade and/or crash!
//
+/* //Disabling the crash mechanics per request
/datum/shuttle/ferry/tether_backup
crash_message = "Tether shuttle distress signal received. Shuttle location is approximately 200 meters from tether base."
- category = /datum/shuttle/ferry/tether_backup // So shuttle_controller.dm doesn't try and instantiate this type as an acutal mapped in shuttle.
+ category = /datum/shuttle/ferry/tether_backup // So SSshuttle.dm doesn't try and instantiate this type as an acutal mapped in shuttle.
var/list/engines = list()
var/obj/machinery/computer/shuttle_control/tether_backup/computer
@@ -139,7 +142,7 @@
else
wear += rand(5,20)
-/obj/structure/shuttle/engine/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/shuttle/engine/attackby(obj/item/W as obj, mob/user as mob)
src.add_fingerprint(user)
if(repair_welder(user, W))
return
@@ -147,7 +150,7 @@
//TODO require a multitool to diagnose and open engine panels or something
-/obj/structure/shuttle/engine/proc/repair_welder(var/mob/user, var/obj/item/weapon/weldingtool/WT)
+/obj/structure/shuttle/engine/proc/repair_welder(var/mob/user, var/obj/item/weldingtool/WT)
if(!istype(WT))
return 0
if(wear <= 20)
@@ -166,6 +169,7 @@
wear = 20
update_icon()
return 1
+*/
////////////////////////////////////////
//////// Excursion Shuttle /////////////
diff --git a/maps/rift/rift_telecomms.dm b/maps/rift/rift_telecomms.dm
index f7760cba6af..b41c8e4e8ae 100644
--- a/maps/rift/rift_telecomms.dm
+++ b/maps/rift/rift_telecomms.dm
@@ -108,6 +108,6 @@
name = "pre-linked multitool (rift hub)"
desc = "This multitool has already been linked to the Atlas telecomms hub and can be used to link multiple machines to the hub, including relays." //cit edit - it's not one use
-/obj/item/device/multitool/tether_buffered/initialize()
+/obj/item/multitool/tether_buffered/Initialize()
. = ..()
buffer = locate(/obj/machinery/telecomms/hub/preset/rift)
diff --git a/maps/rift/rift_things.dm b/maps/rift/rift_things.dm
index 6c0f2b82f16..ebb00858424 100644
--- a/maps/rift/rift_things.dm
+++ b/maps/rift/rift_things.dm
@@ -5,9 +5,9 @@
//Meme shit for the map
-/obj/item/weapon/reagent_containers/food/condiment/cursed
+/obj/item/reagent_containers/food/condiment/cursed
-/obj/item/weapon/reagent_containers/food/condiment/cursed/initialize()
+/obj/item/reagent_containers/food/condiment/cursed/Initialize()
..()
reagents.add_reagent(pick("uranium", "phoron", "hydrophoron"), 50)
name = "\improper cursed condiment bottle"
@@ -16,7 +16,7 @@
//Special map objects
/obj/effect/landmark/map_data/lythios43c
- height = 4
+ height = 4
/obj/structure/metal_edge
name = "metal underside"
@@ -29,8 +29,8 @@
/obj/turbolift_map_holder/rift
name = "Atlas Lift"
depth = 4
- lift_size_x = 4
- lift_size_y = 4
+ lift_size_x = 3
+ lift_size_y = 3
icon = 'icons/obj/turbolift_preview_3x3.dmi'
wall_type = null // Don't make walls
@@ -45,23 +45,33 @@
music = list('sound/music/elevator.ogg') // Woo elevator music!
/obj/machinery/atmospherics/unary/vent_pump/positive
- use_power = 1
+ use_power = USE_POWER_IDLE
icon_state = "map_vent_out"
external_pressure_bound = ONE_ATMOSPHERE * 1.1
-
+/*
+/obj/effect/step_trigger/teleporter/to_mining/New()
+ ..()
+ teleport_x = src.x
+ teleport_y = 2
+ teleport_z = Z_LEVEL_SURFACE_MINE
+*/
+/obj/effect/step_trigger/teleporter/from_mining/New()
+ ..()
+ teleport_x = src.x
+ teleport_y = world.maxy - 1
+ teleport_z = Z_LEVEL_SURFACE_LOW
/*
/obj/effect/step_trigger/teleporter/to_solars/New()
..()
teleport_x = world.maxx - 1
teleport_y = src.y
teleport_z = Z_LEVEL_SOLARS
-
+*/
/obj/effect/step_trigger/teleporter/from_solars/New()
..()
teleport_x = 2
teleport_y = src.y
teleport_z = Z_LEVEL_SURFACE_LOW
-*/
/obj/effect/step_trigger/teleporter/wild/New()
..()
@@ -85,12 +95,12 @@
icon = 'icons/obj/stairs.dmi'
icon_state = "stairs"
invisibility = 0
-/obj/effect/step_trigger/teleporter/to_underdark/initialize()
+/obj/effect/step_trigger/teleporter/to_underdark/Initialize()
. = ..()
teleport_x = x
teleport_y = y
- for(var/z_num in using_map.zlevels)
- var/datum/map_z_level/Z = using_map.zlevels[z_num]
+ for(var/z_num in GLOB.using_map.zlevels)
+ var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
if(Z.name == "Underdark")
teleport_z = Z.z
@@ -98,18 +108,17 @@
icon = 'icons/obj/stairs.dmi'
icon_state = "stairs"
invisibility = 0
-/obj/effect/step_trigger/teleporter/from_underdark/initialize()
+/obj/effect/step_trigger/teleporter/from_underdark/Initialize()
. = ..()
teleport_x = x
teleport_y = y
- for(var/z_num in using_map.zlevels)
- var/datum/map_z_level/Z = using_map.zlevels[z_num]
+ for(var/z_num in GLOB.using_map.zlevels)
+ var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
if(Z.name == "Mining Outpost")
teleport_z = Z.z
-/obj/effect/step_trigger/teleporter/planetary_fall/lythios43c/initialize()
+/obj/effect/step_trigger/teleporter/planetary_fall/lythios43c/find_planet()
planet = planet_lythios43c
- . = ..()
/obj/effect/step_trigger/lost_in_space
var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out."
@@ -128,11 +137,15 @@
last_sound = world.time
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 75, 1)
if(ismob(A) && prob(5))//lucky day
- var/destturf = locate(rand(5,world.maxx-5),rand(5,world.maxy-5),pick(using_map.station_levels))
+ var/destturf = locate(rand(5,world.maxx-5),rand(5,world.maxy-5),pick(GLOB.using_map.station_levels))
new /datum/teleport/instant(A, destturf, 0, 1, null, null, null, 'sound/effects/phasein.ogg')
else
return ..()
+/obj/effect/step_trigger/lost_in_space/tram
+ deathmessage = "You fly down the tunnel of the tram at high speed for a few moments before impact kills you with sheer concussive force."
+
+
// Invisible object that blocks z transfer to/from its turf and the turf above.
/obj/effect/ceiling
invisibility = 101 // nope cant see this
@@ -143,14 +156,16 @@
return FALSE // Block exit from our turf to above
return TRUE
-/obj/effect/ceiling/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/effect/ceiling/CanAllowThrough(atom/movable/mover, turf/target, height=0, air_group=0)
if(mover && mover.z > src.z)
return FALSE // Block entry from above to our turf
return TRUE
-/*
+
//
// TRAM STATION
//
+/* Commented out until the tram has it's own area to replace
+ var/area/shock_area = /area/rift/surfacebase/tram
// The tram's electrified maglev tracks
/turf/simulated/floor/maglev
@@ -159,26 +174,29 @@
icon = 'icons/turf/flooring/maglevs.dmi'
icon_state = "maglevup"
- var/area/shock_area = /area/tether/surfacebase/tram
+ var/area/shock_area = /area/rift/surfacebase/tram
-/turf/simulated/floor/maglev/initialize()
+/turf/simulated/floor/maglev/Initialize()
. = ..()
shock_area = locate(shock_area)
// Walking on maglev tracks will shock you! Horray!
/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc)
+ ..()
if(isliving(AM) && prob(50))
track_zap(AM)
+
/turf/simulated/floor/maglev/attack_hand(var/mob/user)
if(prob(75))
track_zap(user)
+
/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user)
if (!istype(user)) return
if (electrocute_mob(user, shock_area, src))
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
-*/
+
// Tram air scrubbers for keeping arrivals clean - they work even with no area power
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram
name = "\improper Tram Air Scrubber"
@@ -187,7 +205,7 @@
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram/powered()
return TRUE // Always be powered
-
+*/
//Chemistry 'chemavator'
/obj/machinery/smartfridge/chemistry/chemvator
name = "\improper Smart Chemavator - Upper"
@@ -201,7 +219,7 @@
/obj/machinery/smartfridge/chemistry/chemvator/down
name = "\improper Smart Chemavator - Lower"
-/obj/machinery/smartfridge/chemistry/chemvator/down/initialize()
+/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize()
. = ..()
var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP))
if(istype(above))
@@ -213,22 +231,22 @@
// Tram departure cryo doors that turn into ordinary airlock doors at round end
/obj/machinery/cryopod/robot/door/tram
- name = "\improper Landing Pad"
+ name = "\improper Tram Station"
icon = 'icons/obj/doors/Doorextglass.dmi'
icon_state = "door_closed"
+ can_atmos_pass = ATMOS_PASS_NO
base_icon_state = "door_closed"
occupied_icon_state = "door_locked"
- desc = "The landing pad you might've came in from. You could leave the base easily using this."
- on_store_message = "has departed via transit flight."
+ desc = "The tram station you might've came in from. You could leave the base easily using this."
+ on_store_message = "has departed on the tram."
on_store_name = "Travel Oversight"
- on_enter_occupant_message = "A small drone pod arrives at the platform; you step inside and take a seat."
- on_store_visible_message_1 = "'s speakers chime, anouncing a pod has arrived to take"
+ on_enter_occupant_message = "The tram arrives at the platform; you step inside and take a seat."
+ on_store_visible_message_1 = "'s speakers chime, anouncing a tram has arrived to take"
on_store_visible_message_2 = "to the colony"
time_till_despawn = 10 SECONDS
spawnpoint_type = /datum/spawnpoint/tram
-
/obj/machinery/cryopod/robot/door/tram/process()
- if(emergency_shuttle.online() || emergency_shuttle.returned())
+ if(SSemergencyshuttle.online() || SSemergencyshuttle.returned())
// Transform into a door! But first despawn anyone inside
time_till_despawn = 0
..()
@@ -246,7 +264,7 @@
var/mob/living/carbon/human/user = AM
- var/choice = alert("Do you want to depart via a pod? Your character will leave the round.","Departure","Yes","No")
+ var/choice = alert(user, "Do you want to depart via the tram? Your character will leave the round.","Departure","No","Yes")
if(user && Adjacent(user) && choice == "Yes")
var/mob/observer/dead/newghost = user.ghostize()
newghost.timeofdeath = world.time
@@ -265,8 +283,8 @@ var/global/list/latejoin_tram = list()
..()
/datum/spawnpoint/tram
- display_name = "Landing pad"
- msg = "has arrived on station"
+ display_name = "Tram Station"
+ msg = "has arrived on the tram"
/datum/spawnpoint/tram/New()
..()
@@ -324,22 +342,22 @@ var/global/list/latejoin_tram = list()
"Beach" = new/datum/holodeck_program(/area/houseboat/holodeck/beach),
"Desert" = new/datum/holodeck_program(/area/houseboat/holodeck/desert,
list(
- 'sound/effects/wind/wind_2_1.ogg',
- 'sound/effects/wind/wind_2_2.ogg',
- 'sound/effects/wind/wind_3_1.ogg',
- 'sound/effects/wind/wind_4_1.ogg',
- 'sound/effects/wind/wind_4_2.ogg',
- 'sound/effects/wind/wind_5_1.ogg'
+ 'sound/effects/weather/wind/wind_2_1.ogg',
+ 'sound/effects/weather/wind/wind_2_2.ogg',
+ 'sound/effects/weather/wind/wind_3_1.ogg',
+ 'sound/effects/weather/wind/wind_4_1.ogg',
+ 'sound/effects/weather/wind/wind_4_2.ogg',
+ 'sound/effects/weather/wind/wind_5_1.ogg'
)
),
"Snowfield" = new/datum/holodeck_program(/area/houseboat/holodeck/snow,
list(
- 'sound/effects/wind/wind_2_1.ogg',
- 'sound/effects/wind/wind_2_2.ogg',
- 'sound/effects/wind/wind_3_1.ogg',
- 'sound/effects/wind/wind_4_1.ogg',
- 'sound/effects/wind/wind_4_2.ogg',
- 'sound/effects/wind/wind_5_1.ogg'
+ 'sound/effects/weather/wind/wind_2_1.ogg',
+ 'sound/effects/weather/wind/wind_2_2.ogg',
+ 'sound/effects/weather/wind/wind_3_1.ogg',
+ 'sound/effects/weather/wind/wind_4_1.ogg',
+ 'sound/effects/weather/wind/wind_4_2.ogg',
+ 'sound/effects/weather/wind/wind_5_1.ogg'
)
),
"Space" = new/datum/holodeck_program(/area/houseboat/holodeck/space,
@@ -367,17 +385,17 @@ var/global/list/latejoin_tram = list()
icon_state = "wallmed"
icon_deny = "wallmed-deny"
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
- products = list(/obj/item/weapon/reagent_containers/pill/airlock = 10,/obj/item/device/healthanalyzer = 1)
- contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2)
+ products = list(/obj/item/reagent_containers/pill/airlock = 10,/obj/item/healthanalyzer = 1)
+ contraband = list(/obj/item/reagent_containers/pill/tox = 2)
req_log_access = access_cmo
has_logs = 1
-/obj/item/weapon/reagent_containers/pill/airlock
+/obj/item/reagent_containers/pill/airlock
name = "\'Airlock\' Pill"
desc = "Neutralizes toxins and provides a mild analgesic effect."
icon_state = "pill2"
-/obj/item/weapon/reagent_containers/pill/airlock/New()
+/obj/item/reagent_containers/pill/airlock/New()
..()
reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent("paracetamol", 5)
@@ -395,16 +413,33 @@ var/global/list/latejoin_tram = list()
/obj/structure/closet/secure_closet/guncabinet/excursion
name = "expedition weaponry cabinet"
- req_one_access = list(access_explorer,access_brig)
+ req_one_access = list(access_explorer,access_armory)
/obj/structure/closet/secure_closet/guncabinet/excursion/New()
..()
for(var/i = 1 to 4)
- new /obj/item/weapon/gun/energy/frontier/locked(src)
+ new /obj/item/gun/energy/frontier/locked(src)
for(var/i = 1 to 4)
- new /obj/item/weapon/gun/energy/frontier/locked/holdout(src)
+ new /obj/item/gun/energy/frontier/locked/holdout(src)
+
+// Used at centcomm for the elevator
+/obj/machinery/cryopod/robot/door/dorms
+ spawnpoint_type = /datum/spawnpoint/tram
+
+/*\
+//Tether-unique network cameras
+/obj/machinery/camera/network/tether
+ network = list(NETWORK_TETHER)
+
+/obj/machinery/camera/network/tcomms
+ network = list(NETWORK_TCOMMS)
+
+/obj/machinery/camera/network/outside
+ network = list(NETWORK_OUTSIDE)
+
+/obj/machinery/camera/network/exploration
+ network = list(NETWORK_EXPLORATION)
-/*
// Underdark mob spawners
/obj/tether_away_spawner/underdark_normal
name = "Underdark Normal Spawner"
@@ -443,18 +478,55 @@ var/global/list/latejoin_tram = list()
mobs_to_pick_from = list(
/mob/living/simple_animal/hostile/dragon = 1
)
+
+/obj/machinery/camera/network/research/xenobio
+ network = list(NETWORK_RESEARCH, NETWORK_XENOBIO)
+
+//Camera monitors
+/obj/machinery/computer/security/xenobio
+ name = "xenobiology camera monitor"
+ desc = "Used to access the xenobiology cell cameras."
+ icon_keyboard = "mining_key"
+ icon_screen = "mining"
+ network = list(NETWORK_XENOBIO)
+ circuit = /obj/item/circuitboard/security/xenobio
+ light_color = "#F9BBFC"
+
+/obj/item/circuitboard/security/xenobio
+ name = T_BOARD("xenobiology camera monitor")
+ build_path = /obj/machinery/computer/security/xenobio
+ network = list(NETWORK_XENOBIO)
+ req_access = list()
*/
+
// Used at centcomm for the elevator
/obj/machinery/cryopod/robot/door/dorms
spawnpoint_type = /datum/spawnpoint/tram
+//Dance pole
+/obj/structure/dancepole
+ name = "dance pole"
+ desc = "Engineered for your entertainment"
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "dancepole"
+ density = 0
+ anchored = 1
+
+/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob)
+ if(O.is_wrench())
+ anchored = !anchored
+ playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ if(anchored)
+ to_chat(user, "You secure \the [src].")
+ else
+ to_chat(user, "You unsecure \the [src].")
//
// ### Wall Machines On Full Windows ###
// To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window
//
-/obj/item/device/radio/intercom
+/obj/item/radio/intercom
layer = ABOVE_WINDOW_LAYER
-/obj/item/weapon/storage/secure/safe
+/obj/item/storage/secure/safe
layer = ABOVE_WINDOW_LAYER
/obj/machinery/airlock_sensor
layer = ABOVE_WINDOW_LAYER
diff --git a/maps/rift/rift_turfs.dm b/maps/rift/rift_turfs.dm
index c1b8a019547..972a6c81af1 100644
--- a/maps/rift/rift_turfs.dm
+++ b/maps/rift/rift_turfs.dm
@@ -2,8 +2,8 @@
LYTHIOS43C_TURF_CREATE(/turf/simulated/open)
/turf/simulated/open/lythios43c
edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
-/turf/simulated/open/lythios43c/New()
- ..()
+/turf/simulated/open/lythios43c/Initialize(mapload)
+ . = ..()
if(outdoors)
SSplanets.addTurf(src)
@@ -11,8 +11,7 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/floor)
/turf/simulated/floor/lythios43c_indoors
LYTHIOS43C_SET_ATMOS
-/turf/simulated/floor/lythios43c_indoors/update_graphic(list/graphic_add = null, list/graphic_remove = null)
- return 0
+ allow_gas_overlays = FALSE
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/reinforced)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/tiled/steel_dirty)
@@ -25,24 +24,28 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/ice)
/turf/simulated/floor/outdoors/ice/lythios43c
)
-/turf/simulated/icerock
- oxygen = 0
- nitrogen = 0
- temperature = TCMB
-/turf/simulated/floor/outdoors
- oxygen = 0
- nitrogen = 0
- temperature = TCMB
+/turf/simulated/mineral/icerock
+ initial_gas_mix = GAS_STRING_STP
-LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock)
-LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock/floor)
+/turf/simulated/floor/outdoors
+ initial_gas_mix = GAS_STRING_STP
+
+/turf/simulated/mineral/vacuum
+ initial_gas_mix = GAS_STRING_VACCUM
+
+/turf/simulated/mineral/floor/vacuum
+ initial_gas_mix = GAS_STRING_VACCUM
+
+LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock)
+LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock/floor)
//This proc is responsible for ore generation on surface turfs
-/turf/simulated/icerock/lythios43c/make_ore(var/rare_ore)
+/turf/simulated/mineral/icerock/lythios43c/make_ore(var/rare_ore)
if(mineral || ignore_mapgen)
return
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
+ "marble" = 3,
"uranium" = 10,
"platinum" = 10,
"hematite" = 20,
@@ -50,43 +53,53 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock/floor)
"diamond" = 1,
"gold" = 8,
"silver" = 8,
- "phoron" = 18))
+ "phoron" = 18,
+ "lead" = 2,
+ "verdantium" = 1))
else
mineral_name = pickweight(list(
+ "marble" = 2,
"uranium" = 5,
"platinum" = 5,
"hematite" = 35,
"carbon" = 35,
"gold" = 3,
"silver" = 3,
- "phoron" = 25))
+ "phoron" = 25,
+ "lead" = 1))
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]
UpdateMineral()
update_icon()
-/turf/simulated/icerock/lythios43c/rich/make_ore(var/rare_ore)
+/turf/simulated/mineral/icerock/lythios43c/rich/make_ore(var/rare_ore)
if(mineral || ignore_mapgen)
return
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
+ "marble" = 7,
"uranium" = 10,
"platinum" = 10,
"hematite" = 10,
"carbon" = 10,
"diamond" = 4,
"gold" = 15,
- "silver" = 15))
+ "silver" = 15,
+ "lead" = 5,
+ "verdantium" = 2))
else
mineral_name = pickweight(list(
+ "marble" = 5,
"uranium" = 7,
"platinum" = 7,
"hematite" = 28,
"carbon" = 28,
"diamond" = 2,
"gold" = 7,
- "silver" = 7))
+ "silver" = 7,
+ "lead" = 4,
+ "verdantium" = 1))
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]
UpdateMineral()
@@ -143,7 +156,7 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock/floor)
/turf/space/bluespace
name = "bluespace"
icon_state = "bluespace"
-/turf/space/bluespace/initialize()
+/turf/space/bluespace/Initialize()
..()
icon_state = "bluespace"
@@ -152,7 +165,7 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock/floor)
name = "sand transit"
icon = 'icons/turf/transit_vr.dmi'
icon_state = "desert_ns"
-/turf/space/sandyscroll/initialize()
+/turf/space/sandyscroll/Initialize()
..()
icon_state = "desert_ns"
@@ -160,7 +173,7 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/icerock/floor)
/turf/simulated/sky/lythios43c
color = "#DAFFFA"
-/turf/simulated/sky/lythios43c/initialize()
+/turf/simulated/sky/lythios43c/Initialize()
SSplanets.addTurf(src)
set_light(2, 2, "#DAFFFA")
diff --git a/vorestation.dme b/vorestation.dme
index ced545c0ec1..56a304e2479 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1299,6 +1299,7 @@
#include "code\game\objects\structures\transit_tubes.dm"
#include "code\game\objects\structures\trash_pile.dm"
#include "code\game\objects\structures\under_wardrobe.dm"
+#include "code\game\objects\structures\ventcover.dm"
#include "code\game\objects\structures\watercloset.dm"
#include "code\game\objects\structures\windoor_assembly.dm"
#include "code\game\objects\structures\window.dm"
@@ -2222,6 +2223,7 @@
#include "code\modules\mapping\space_management\space_transition.dm"
#include "code\modules\mapping\space_management\traits.dm"
#include "code\modules\mapping\space_management\zlevel_manager.dm"
+#include "code\modules\maps\rift\atmospheres\lythios43c.dm"
#include "code\modules\maps\tether\atmospheres\virgo2.dm"
#include "code\modules\maps\tether\atmospheres\virgo3b.dm"
#include "code\modules\maps\tg\dmm_suite.dm"
@@ -3526,7 +3528,6 @@
#include "maps\submaps\surface_submaps\plains\plains_areas.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
-#include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm"
#include "modular_citadel\code\global_cit.dm"
#include "modular_citadel\code\datums\outfits\jobs\centcom.dm"