From 16d17921f90630a0bfdb38cd2672c64dc67cfae7 Mon Sep 17 00:00:00 2001 From: AlexanderUlanH Date: Sat, 2 Nov 2013 17:01:54 -0400 Subject: [PATCH] Cha-cha-cha-changes Changed the shuttle controller to a datum, changed the appearance of the labor shuttle, and fixed stackers giving one free stack of each ore. --- code/controllers/shuttle_controller.dm | 4 +-- code/modules/admin/topic.dm | 4 +-- code/modules/mining/laborcamp/laborshuttle.dm | 2 +- code/modules/mining/laborcamp/laborstacker.dm | 2 +- code/modules/mining/machine_stacking.dm | 4 ++- code/modules/shuttle/shuttle.dm | 10 +++---- maps/tgstation.2.1.2.dmm | 30 +++++++++---------- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 9610b7d34ba..051cd78616d 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -117,7 +117,7 @@ datum/shuttle_controller world << sound('sound/AI/shuttlecalled.ogg') proc/move_shuttles() - var/obj/shuttle_manager/s + var/datum/shuttle_manager/s for(var/t in pods) s = shuttles[t] s.move_shuttle() @@ -143,7 +143,7 @@ datum/shuttle_controller fake_recall = 0 return 0 else if(timeleft <= 0) - var/obj/shuttle_manager/s = shuttles["escape"] + var/datum/shuttle_manager/s = shuttles["escape"] s.move_shuttle() location = DOCKED settimeleft(SHUTTLELEAVETIME) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d588c617f78..8625a9e3ba4 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1922,14 +1922,14 @@ if("moveminingshuttle") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShM") - var/obj/shuttle_manager/s = shuttles["mining"] + var/datum/shuttle_manager/s = shuttles["mining"] if(istype(s)) s.move_shuttle() message_admins("\blue [key_name_admin(usr)] moved mining shuttle", 1) log_admin("[key_name(usr)] moved the mining shuttle") if("moveferry") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShF") - var/obj/shuttle_manager/s = shuttles["ferry"] + var/datum/shuttle_manager/s = shuttles["ferry"] if(istype(s)) s.move_shuttle() message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1) log_admin("[key_name(usr)] moved the centcom ferry") diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 2a1f6d6cf99..fb93f98e83a 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -15,7 +15,7 @@ /obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list) if(href_list["move"]) - var/obj/shuttle_manager/s = shuttles["laborcamp"] + var/datum/shuttle_manager/s = shuttles["laborcamp"] if(s.location == /area/shuttle/laborcamp/outpost) usr << "\blue Shuttle is already at the outpost." return 0 diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 1417fb9c0bf..5b4874db4c5 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -92,7 +92,7 @@ else usr << "\red No valid ID." if(check_auth()) //Sanity check against hef spoofs if(href_list["choice"] == "station") - var/obj/shuttle_manager/s = shuttles["laborcamp"] + var/datum/shuttle_manager/s = shuttles["laborcamp"] if(s.location == /area/shuttle/laborcamp/outpost) if (s.move_shuttle()) usr << "\blue Shuttle recieved message and will be sent shortly." diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index c48583a5d7d..15502d6057b 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -91,7 +91,9 @@ if(!istype(inp)) //Non-sheets. Yuck. return if(!(inp.type in stack_list)) //It's the first of this sheet added - stack_list[inp.type] = new inp.type(src,0) + var/obj/item/stack/sheet/s = new inp.type(src,0) + s.amount = 0 + stack_list[inp.type] = s var/obj/item/stack/sheet/storage = stack_list[inp.type] storage.amount += inp.amount //Stack the sheets inp.loc = null //Let the old sheet garbage collect diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 78fc592cef9..f8421ca246a 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -1,16 +1,16 @@ -var/obj/list/shuttles = list(("escape" = new /obj/shuttle_manager(/area/shuttle/escape/centcom, 0)), ("pod1" = new /obj/shuttle_manager(/area/shuttle/escape_pod1/station, 0)), ("pod2" = new /obj/shuttle_manager(/area/shuttle/escape_pod2/station, 0)), ("pod3" = new /obj/shuttle_manager(/area/shuttle/escape_pod3/station, 0)), ("pod4" = new /obj/shuttle_manager(/area/shuttle/escape_pod4/station, 0)), ("mining" = new /obj/shuttle_manager(/area/shuttle/mining/station, 10)), ("laborcamp" = new /obj/shuttle_manager(/area/shuttle/laborcamp/station, 10)), ("ferry" = new /obj/shuttle_manager(/area/shuttle/transport1/centcom, 0))) +var/obj/list/shuttles = list(("escape" = new /datum/shuttle_manager(/area/shuttle/escape/centcom, 0)), ("pod1" = new /datum/shuttle_manager(/area/shuttle/escape_pod1/station, 0)), ("pod2" = new /datum/shuttle_manager(/area/shuttle/escape_pod2/station, 0)), ("pod3" = new /datum/shuttle_manager(/area/shuttle/escape_pod3/station, 0)), ("pod4" = new /datum/shuttle_manager(/area/shuttle/escape_pod4/station, 0)), ("mining" = new /datum/shuttle_manager(/area/shuttle/mining/station, 10)), ("laborcamp" = new /datum/shuttle_manager(/area/shuttle/laborcamp/station, 10)), ("ferry" = new /datum/shuttle_manager(/area/shuttle/transport1/centcom, 0))) //Pre-made shuttles should have non-number keys, so that buildable shuttles can use numbered keys without allowing 'I build a shuttle console with the escape number as its ID.' -obj/shuttle_manager +datum/shuttle_manager var/tickstomove = 10 //How long does it take to move the shuttle? var/moving = 0 //Is it moving? var/area/shuttle/location //The current location of the actual shuttle -obj/shuttle_manager/New(var/area, var/delay) //Create a new shuttle manager for the shuttle starting area, "area" and with a movement delay of tickstomove +datum/shuttle_manager/New(var/area, var/delay) //Create a new shuttle manager for the shuttle starting area, "area" and with a movement delay of tickstomove location = area tickstomove = delay -obj/shuttle_manager/proc/move_shuttle() +datum/shuttle_manager/proc/move_shuttle() if(moving) return 0 moving = 1 spawn(tickstomove*10) @@ -97,7 +97,7 @@ obj/shuttle_manager/proc/move_shuttle() return if(href_list["move"]) if(id in shuttles) - var/obj/shuttle_manager/s = shuttles[id] + var/datum/shuttle_manager/s = shuttles[id] if (s.move_shuttle()) usr << "\blue Shuttle recieved message and will be sent shortly." else diff --git a/maps/tgstation.2.1.2.dmm b/maps/tgstation.2.1.2.dmm index dd3272e2aa8..503d61f4cae 100644 --- a/maps/tgstation.2.1.2.dmm +++ b/maps/tgstation.2.1.2.dmm @@ -310,7 +310,7 @@ "afX" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "afY" = (/obj/machinery/door/airlock/security{name = "Prisoner Processing"; req_access = null; req_access_txt = "2"},/turf/simulated/floor/plating,/area/security/processing) "afZ" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "dark"},/area/security/brig) -"aga" = (/obj/machinery/door/airlock/security{name = "N2O Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor/plating,/area/security/brig) +"aga" = (/obj/machinery/door/airlock/security{name = "N2O Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "agb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor,/area/security/brig) "agc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/brig) "agd" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/brig) @@ -506,7 +506,7 @@ "ajL" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "ajM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "ajN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/courtroom) -"ajO" = (/obj/structure/closet/crate,/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "floorgrime"},/area/shuttle/laborcamp/station) +"ajO" = (/obj/structure/closet/crate,/turf/simulated/shuttle/floor,/area/shuttle/laborcamp/station) "ajP" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ajQ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ajR" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/security/processing) @@ -2060,7 +2060,7 @@ "aNF" = (/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/bridge) "aNG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/bridge) "aNH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor,/area/bridge) -"aNI" = (/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "floorgrime"},/area/shuttle/laborcamp/station) +"aNI" = (/turf/simulated/shuttle/floor,/area/shuttle/laborcamp/station) "aNJ" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor{dir = 2; icon_state = "brown"},/area/bridge) "aNK" = (/obj/machinery/computer/security/mining,/turf/simulated/floor{dir = 6; icon_state = "brown"},/area/bridge) "aNL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -4043,7 +4043,7 @@ "bzM" = (/turf/simulated/floor/airless{icon_state = "warning"; dir = 1},/area/toxins/test_area) "bzN" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/shuttle/mining/station) "bzO" = (/obj/structure/table,/turf/simulated/shuttle/floor,/area/shuttle/mining/station) -"bzP" = (/obj/machinery/mineral/output,/obj/machinery/mineral/stacking_unit_console{machinedir = 1; pixel_x = -30},/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "floorgrime"},/area/shuttle/laborcamp/station) +"bzP" = (/obj/machinery/mineral/output,/obj/machinery/mineral/stacking_unit_console{machinedir = 1; pixel_x = -30},/turf/simulated/shuttle/floor,/area/shuttle/laborcamp/station) "bzQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bzR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bzS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -4128,7 +4128,7 @@ "bBt" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/airless,/area/mine/abandoned) "bBu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) "bBv" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) -"bBw" = (/obj/machinery/door/airlock/glass_security{id_tag = "prisonshuttle"; name = "Secure Shuttle Access"; req_access_txt = "3"},/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "floorgrime"},/area/shuttle/laborcamp/station) +"bBw" = (/obj/machinery/door/airlock/glass_security{id_tag = "prisonshuttle"; name = "Secure Shuttle Access"; req_access_txt = "3"},/turf/simulated/floor/plating,/area/shuttle/laborcamp/station) "bBx" = (/turf/simulated/floor/airless{dir = 8; icon_state = "warning"},/area/toxins/test_area) "bBy" = (/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bBz" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) @@ -4179,7 +4179,7 @@ "bCs" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bCt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/cmo) "bCu" = (/obj/machinery/vending/cola,/turf/simulated/floor{icon_state = "cafeteria"},/area/toxins/misc_lab{name = "\improper Research Lounge"}) -"bCv" = (/obj/machinery/mineral/stacking_machine/laborstacker,/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "floorgrime"},/area/shuttle/laborcamp/station) +"bCv" = (/obj/machinery/mineral/stacking_machine/laborstacker,/turf/simulated/floor/plating,/area/shuttle/laborcamp/station) "bCw" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{icon_state = "cafeteria"},/area/toxins/misc_lab{name = "\improper Research Lounge"}) "bCx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bCy" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/toxins/xenobiology) @@ -5550,8 +5550,8 @@ "ccL" = (/obj/structure/table,/obj/item/weapon/book/manual/engineering_guide,/obj/item/weapon/book/manual/engineering_particle_accelerator{pixel_y = 6},/turf/simulated/floor,/area/engine/engineering) "ccM" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) "ccN" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/processing) -"ccO" = (/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/laborcamp/station) -"ccP" = (/obj/machinery/mineral/input,/obj/machinery/mineral/labor_claim_console{machinedir = 2; pixel_x = -30},/turf/simulated/shuttle/floor{dir = 8; icon = 'icons/turf/floors.dmi'; icon_state = "vault"},/area/shuttle/laborcamp/station) +"ccO" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/laborcamp/station) +"ccP" = (/obj/machinery/mineral/input,/obj/machinery/mineral/labor_claim_console{machinedir = 2; pixel_x = -30},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/laborcamp/station) "ccQ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/engine/engineering) "ccR" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/machinery/camera{c_tag = "Engineering Storage"; dir = 4; network = list("SS13")},/turf/simulated/floor,/area/engine/engineering) "ccS" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor,/area/engine/engineering) @@ -5591,8 +5591,8 @@ "cdA" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/gas{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) "cdB" = (/obj/structure/sign/pods{pixel_x = 32; pixel_y = 0},/obj/structure/closet/firecloset,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/engine/engineering) "cdC" = (/obj/machinery/camera{c_tag = "Engineering Escape Pod"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/engine/engineering) -"cdD" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/laborcamp/station) -"cdE" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/laborcamp/station) +"cdD" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor,/area/shuttle/laborcamp/station) +"cdE" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/laborcamp/station) "cdF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) "cdG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/engineering) "cdH" = (/obj/machinery/door/poddoor/shutters/preopen{id = "Singularity"; name = "radiation shutters"},/turf/simulated/floor/plating,/area/engine/engineering) @@ -5790,7 +5790,7 @@ "chr" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; name = "thrower_leftnostop"},/turf/space/transit/east/shuttlespace_ew2,/area) "chs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/processing) "cht" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/security/processing) -"chu" = (/obj/machinery/computer/shuttle/labor,/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/laborcamp/station) +"chu" = (/obj/machinery/computer/shuttle/labor,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/laborcamp/station) "chv" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0},/turf/space/transit/east/shuttlespace_ew7,/area) "chw" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns5,/area) "chx" = (/turf/space/transit/north/shuttlespace_ns2,/area/shuttle/escape/transit) @@ -6036,7 +6036,7 @@ "cmd" = (/turf/simulated/shuttle/wall{icon_state = "swall0"; dir = 2},/area/centcom/evac) "cme" = (/obj/structure/stool/bed,/turf/simulated/shuttle/floor,/area/centcom/evac) "cmf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/centcom/evac) -"cmg" = (/obj/structure/table,/turf/simulated/shuttle/floor{icon = 'icons/turf/floors.dmi'; icon_state = "dark"},/area/shuttle/laborcamp/station) +"cmg" = (/obj/structure/table,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/laborcamp/station) "cmh" = (/obj/machinery/door/airlock/hatch{name = "Rest Room"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/centcom/evac) "cmi" = (/turf/simulated/shuttle/wall{icon_state = "swall2"; dir = 2},/area/centcom/evac) "cmj" = (/obj/structure/table,/obj/structure/bedsheetbin,/turf/simulated/shuttle/floor,/area/centcom/evac) @@ -8007,18 +8007,18 @@ "cXY" = (/turf/simulated/mineral/random/labormineral,/area/mine/explored) "cXZ" = (/turf/simulated/floor{icon_plating = "asteroid"; icon_state = "asteroid"; name = "Asteroid"},/area/mine/explored) "cYa" = (/turf/simulated/wall,/area/mine/laborcamp) -"cYb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/mine/laborcamp) +"cYb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp) "cYc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/mine/laborcamp) "cYd" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/mine/laborcamp) "cYe" = (/obj/machinery/computer/security{name = "Labor Camp Monitoring"; network = list("Labor")},/turf/simulated/floor,/area/mine/laborcamp) "cYf" = (/obj/machinery/computer/prisoner,/turf/simulated/floor,/area/mine/laborcamp) "cYg" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor,/area/mine/laborcamp) "cYh" = (/turf/simulated/floor,/area/mine/laborcamp) -"cYi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/mine/laborcamp) +"cYi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp) "cYj" = (/obj/structure/lattice,/turf/space,/area/mine/unexplored) "cYk" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_plating = "asteroid"; icon_state = "asteroid"; name = "Asteroid"},/area/mine/explored) "cYl" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/mine/laborcamp) -"cYm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/mine/laborcamp) +"cYm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/laborcamp) "cYn" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor,/area/mine/laborcamp) "cYo" = (/turf/simulated/floor,/area/mine/explored) "cYp" = (/turf/simulated/floor{icon_state = "asteroidfloor"},/area/mine/explored)