From 50a489d1d78e9f7c7b5de555d32e37d48c45ee60 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:41:26 +0700 Subject: [PATCH 01/11] 357 speedloaders added to all other inteq ships (#1205) --- _maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm | 3 +++ _maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm | 3 +++ _maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm | 3 +++ _maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm | 3 +++ _maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm | 3 +++ 5 files changed, 15 insertions(+) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm index f77bfd266bad..2638fb1f65bb 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm @@ -2647,6 +2647,9 @@ /obj/item/storage/belt/security/webbing/inteq, /obj/item/storage/belt/military/assault, /obj/item/clothing/head/inteq_peaked, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/carpet/orange, /area/ship/bridge) "Dq" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm index 4752c3e59141..d433747208d8 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm @@ -1249,6 +1249,9 @@ /obj/item/clothing/glasses/hud/security/sunglasses/inteq, /obj/item/gun/energy/e_gun/adv_stopping, /obj/item/stock_parts/cell/gun/upgraded, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/plasteel/dark, /area/ship/bridge) "nB" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm index 58ec8b29814c..38d9af33bd70 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm @@ -6587,6 +6587,9 @@ /obj/item/storage/lockbox/medal/sec{ pixel_y = 5 }, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Mo" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm index 7ac305a9efb3..a551f25ebab4 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_valor.dmm @@ -4355,6 +4355,9 @@ /obj/item/storage/lockbox/medal/sec, /obj/item/clothing/glasses/hud/security/sunglasses/inteq, /obj/item/clothing/head/inteq_peaked, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/carpet/orange, /area/ship/bridge) "Od" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm index 208ff76b7798..2dd69b1c7c08 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm @@ -937,6 +937,9 @@ dir = 1 }, /obj/item/clothing/head/inteq_peaked, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, /turf/open/floor/plasteel/dark, /area/ship/bridge) "mE" = ( From a6b781832410040c02cdecc8193da3b9624d0500 Mon Sep 17 00:00:00 2001 From: arealbeba <121337883+arealbeba@users.noreply.github.com> Date: Sat, 23 Nov 2024 01:25:23 +0700 Subject: [PATCH 02/11] =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B0=D0=BF=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=20=D1=80=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=20+=20=D0=B2=D0=B5=D1=89=D0=B8=20=D0=BB=D0=BF=20=D1=83?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D1=89=D0=B8=D0=BA=D0=B0=20(#1202)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ремаперство рейнджера * добавления всякого * микрофиксим * 220 микрофиксов * микрофиксы по карте * пояс забыл поменять * микроприкол * лестница родная вернулась --- .../configs/nanotrasen_ranger.json | 8 +- .../shuttles/nanotrasen/nanotrasen_ranger.dmm | 3478 ++++++++++------- mod_celadon/items/_items.dme | 1 + mod_celadon/items/code/spacesuits.dm | 22 + mod_celadon/outfit/_outfit.dme | 1 + .../outfit/code/nanotrasen/nt_card_id.dm | 4 + .../outfit/code/nanotrasen/nt_outfit.dm | 17 + 7 files changed, 2133 insertions(+), 1398 deletions(-) create mode 100644 mod_celadon/items/code/spacesuits.dm create mode 100644 mod_celadon/outfit/code/nanotrasen/nt_card_id.dm diff --git a/_maps/_mod_celadon/configs/nanotrasen_ranger.json b/_maps/_mod_celadon/configs/nanotrasen_ranger.json index e70fc6c15b6c..d1fe3d23c63a 100644 --- a/_maps/_mod_celadon/configs/nanotrasen_ranger.json +++ b/_maps/_mod_celadon/configs/nanotrasen_ranger.json @@ -6,8 +6,8 @@ "map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm", "enabled": true, "limit": 1, - "starting_funds": 4000, - "prefix": "NTSV", + "starting_funds": 3000, + "prefix": "NTBSV", "faction": "/datum/faction/nt", "tags": [ "Combat", @@ -40,8 +40,8 @@ "outfit": "/datum/outfit/job/nanotrasen/doctor/lp", "slots": 1 }, - "Intern": { - "outfit": "/datum/outfit/job/nanotrasen/assistant", + "LP Janitorial Specialist": { + "outfit": "/datum/outfit/job/nanotrasen/janitor/lp", "slots": 1 } } diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm index ddec93bd84d2..66af9b5a1c7e 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -1,19 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 11; - layer = 4.2 - }, -/obj/structure/railing{ +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ dir = 4 }, -/obj/item/toy/plush/moth/redish{ - pixel_x = -4; - layer = 4.3 - }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/ship/security) "ad" = ( /obj/structure/cable{ @@ -26,18 +18,24 @@ dir = 4 }, /obj/machinery/light_switch{ - pixel_x = 8; + pixel_x = 12; pixel_y = 22 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/ship/maintenance/port) "am" = ( -/obj/structure/urinal{ - pixel_y = 29 - }, -/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/wood{ + name = "Restroom"; + req_ship_access = 0 }, /turf/open/floor/plastic, /area/ship/crew/toilet) @@ -48,6 +46,12 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"ar" = ( +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/machinery/light/floor, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "az" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -56,7 +60,7 @@ icon_state = "1-2" }, /obj/machinery/light/floor, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "aD" = ( /obj/machinery/light/dim/directional/north, @@ -64,25 +68,29 @@ /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "aG" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/storage/box/stockparts/basic, -/obj/machinery/light/dim/directional/south, -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/head/beret/eng/hazard, +/obj/item/storage/backpack/satchel/eng, +/obj/item/storage/backpack/messenger/engi, +/obj/item/storage/backpack/industrial, +/obj/item/storage/backpack/duffelbag/engineering, +/obj/item/clothing/under/rank/engineering/engineer/nt/lp, +/obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp, +/obj/item/storage/backpack/ert/engineer, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 }, -/obj/machinery/cell_charger, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/wood, /area/ship/engineering) "aI" = ( /obj/machinery/door/poddoor/shutters{ dir = 4; - id = "Ranger_FireFighting_Shut" + id = "Ranger_FireFighting_Shut"; + name = "Cargo Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -101,34 +109,45 @@ }, /obj/effect/turf_decal/corner/opaque/brown/mono, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "aK" = ( /obj/machinery/light/dim/directional/north, /obj/item/radio/intercom/directional/east, -/obj/structure/reagent_dispensers/foamtank, +/obj/structure/closet/crate/large, +/obj/effect/turf_decal/trimline/opaque/brown/line, +/obj/item/clothing/suit/space/hardsuit/ancient/lp, +/obj/item/disk/design_disk/ammo_c9mm, +/obj/item/circuitboard/machine/techfab/department/security{ + pixel_x = 0; + pixel_y = -4 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) +"aM" = ( +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "aO" = ( -/obj/structure/closet/secure_closet/lp/medical, -/obj/item/storage/box/gloves, -/obj/item/storage/box/masks, -/obj/item/storage/belt/medical, -/obj/item/flashlight/seclite, -/obj/item/roller, -/obj/item/holosign_creator/medical, -/obj/item/pinpointer/crew, -/obj/item/storage/box/bodybags, -/obj/item/storage/firstaid/regular, -/turf/open/floor/wood, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "aP" = ( /turf/open/floor/plating, /area/ship/engineering) +"aR" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "aW" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/ship/maintenance/port) "bf" = ( @@ -141,7 +160,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/filled/corner{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "bn" = ( /obj/machinery/light/dim/directional/south, @@ -153,7 +172,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "br" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ @@ -168,33 +187,29 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"bt" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "bu" = ( -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "bw" = ( -/obj/structure/closet/secure_closet/lp/security, -/obj/item/clothing/glasses/sunglasses/gar, -/obj/item/melee/classic_baton/telescopic, -/obj/item/flashlight/seclite, -/obj/item/melee/knife/survival, -/obj/item/holosign_creator/security, -/obj/item/storage/box/handcuffs, -/obj/item/restraints/legcuffs/bola/energy, -/obj/item/holosign_creator/security, -/obj/item/clothing/suit/armor/vest/security, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/gps, -/obj/item/gun/ballistic/automatic/pistol/commander, -/obj/structure/railing{ +/obj/machinery/door/airlock/public/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/storage/belt/security/webbing, -/turf/open/floor/wood, -/area/ship/security) +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "bD" = ( /obj/structure/chair/wood{ dir = 8 @@ -202,15 +217,36 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) -"bN" = ( -/obj/structure/window/reinforced{ - dir = 8 +"bE" = ( +/obj/structure/weightmachine/stacklifter, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 9 }, -/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel/dark, /area/ship/security) +"bN" = ( +/obj/item/bedsheet/hos, +/obj/structure/bed, +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/curtain/cloth/fancy, +/turf/open/floor/wood, +/area/ship/security) +"bR" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "bX" = ( /obj/machinery/telecomms/bus/preset_four{ autolinkers = list("hub","processor4","bus"); @@ -218,25 +254,17 @@ id = "Nanotrasen Communications Bus"; freq_listening = list(1353,1447,1459) }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/effect/turf_decal/techfloor{ + dir = 4 }, +/turf/open/floor/circuit, /area/ship/engineering/communications) -"cj" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) "cv" = ( /obj/structure/chair/comfy/shuttle{ dir = 4; name = "Operations" }, -/obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/effect/turf_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "cx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -256,7 +284,7 @@ /obj/structure/cable{ icon_state = "4-9" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "cE" = ( /obj/structure/railing{ @@ -264,8 +292,19 @@ }, /obj/effect/decal/cleanable/glass, /obj/machinery/light/dim/directional/south, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"cF" = ( +/obj/structure/closet/emcloset/wall/directional/west, +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "cI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 10 @@ -295,7 +334,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "cR" = ( /obj/structure/cable{ @@ -306,9 +345,18 @@ /obj/effect/turf_decal/trimline/opaque/blue/filled/line{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"cT" = ( +/obj/machinery/camera/autoname, +/obj/machinery/light/floor, +/turf/open/floor/engine/hull, +/area/ship/external) "cW" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "dd" = ( @@ -316,12 +364,13 @@ /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "dl" = ( /obj/machinery/door/poddoor/shutters{ dir = 4; - id = "Ranger_FireFighting_Shut" + id = "Ranger_FireFighting_Shut"; + name = "Cargo Bay" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -331,18 +380,18 @@ }, /obj/effect/turf_decal/corner/opaque/brown/mono, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "dn" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 4 + dir = 1 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "dq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -350,7 +399,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "dr" = ( /obj/machinery/power/smes{ @@ -366,18 +415,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/light/dim/directional/south, /turf/open/floor/plasteel/dark, /area/ship/bridge) "dG" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/binary/valve/layer4{ - dir = 8; - name = "Disposals Outlet Valve" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/hallway/central) "dK" = ( @@ -391,13 +438,15 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "dM" = ( /obj/structure/cable/cyan{ icon_state = "6-8" }, /obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/ship/maintenance/port) "dP" = ( @@ -417,11 +466,6 @@ /obj/structure/cable{ icon_state = "5-8" }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -7; - pixel_y = -19 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -445,8 +489,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/ship_gravity, -/turf/open/floor/plasteel/mono/dark, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) "er" = ( /obj/structure/cable{ @@ -462,21 +505,59 @@ dir = 4 }, /obj/effect/turf_decal/corner/opaque/ntblue, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"et" = ( +/obj/effect/turf_decal/corner/opaque/vired/half, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = 0; + pixel_y = -32 + }, +/obj/structure/closet/secure_closet{ + icon_state = "sec"; + name = "nonlethal equipment" + }, +/obj/item/melee/classic_baton, +/obj/item/melee/baton, +/obj/item/gun/energy/disabler, +/obj/item/gun/energy/disabler, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30; + pixel_y = 0 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "eE" = ( -/obj/machinery/computer/cargo{ +/obj/effect/turf_decal/corner/opaque/red/half{ dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"eN" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/window/reinforced/spawner{ dir = 1 }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/vending/security, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"eM" = ( +/obj/machinery/light/floor, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"eN" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"eP" = ( +/obj/effect/turf_decal/industrial/outline/orange, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/port) "eT" = ( /obj/machinery/button/door{ dir = 1; @@ -496,23 +577,34 @@ /obj/structure/cable{ icon_state = "4-9" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "eU" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/sprayweb, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/machinery/door/window/brigdoor, +/obj/structure/window/reinforced/spawner{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/tank/internals/emergency_oxygen, +/obj/effect/turf_decal/corner/opaque/purple/half{ + dir = 1 + }, +/obj/item/clothing/suit/space/hardsuit/ert/lp/jani, +/obj/item/clothing/mask/gas, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "eY" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/line{ - dir = 4 + dir = 4; + layer = 2.032 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "fd" = ( -/obj/effect/turf_decal/corner/opaque/ntblue/border{ - dir = 8 - }, /obj/structure/cable{ icon_state = "6-8" }, @@ -525,61 +617,110 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "ff" = ( /obj/structure/railing{ dir = 1 }, /obj/effect/turf_decal/techfloor/hole/right, -/obj/machinery/telecomms/message_server/preset{ - autolinkers = list("messaging","hub"); - network = "nt_commnet"; - layer = 3.1 +/obj/item/banner/command{ + layer = 3.09; + anchored = 1 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"fl" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo) "fo" = ( -/obj/structure/window/reinforced/tinted/frosted, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/machinery/light/dim/directional/west, +/turf/open/floor/plasteel, +/area/ship/crew/janitor) "fy" = ( -/obj/structure/table/wood, /obj/item/newspaper, -/turf/open/floor/plasteel/dark, +/obj/structure/table/reinforced/titaniumglass, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "fz" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - name = "Cargo Bay"; - id = "Ranger_Cargo_Door" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + name = "Armory"; + id = "Ranger_Armory_Door" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"fD" = ( +/obj/machinery/porta_turret/ship/faction/nanotrasen{ + dir = 9 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/bridge) +"fL" = ( +/obj/machinery/light/floor, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/engine/hull, +/area/ship/external) "fU" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/tech/airless, +/obj/machinery/light/dim/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "fV" = ( -/turf/closed/wall/r_wall, +/obj/item/paper, +/obj/structure/table/reinforced/titaniumglass, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 10 + }, +/obj/item/pen/blue{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/stamp/clown{ + pixel_x = -8; + pixel_y = -1 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = 0; + pixel_y = -31 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "gg" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "gh" = ( /obj/structure/chair/comfy/blue/directional/east, /obj/item/toy/plush/moth/lovers, /obj/item/radio/intercom/directional/north, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "gi" = ( /obj/machinery/light_switch{ @@ -593,16 +734,28 @@ dir = 1 }, /obj/machinery/camera/autoname, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "gk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/firedoor/window, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/machinery/door/airlock/command{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + name = "Intelligence Core"; + id = "AiCore" + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "gz" = ( /obj/machinery/camera/autoname{ @@ -617,15 +770,17 @@ /obj/structure/cable/cyan{ icon_state = "4-10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "gG" = ( /obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/machinery/door/airlock/medical/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -635,15 +790,37 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/medical{ + name = "Medical Bay" + }, /turf/open/floor/plasteel/white, /area/ship/medical) "gL" = ( -/obj/structure/railing/corner{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/vired/half, +/obj/structure/guncloset, +/obj/structure/sign/poster/official/ion_carbine{ + pixel_x = -1; + pixel_y = -31 }, -/obj/effect/turf_decal/industrial/outline/yellow, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/item/gun/ballistic/automatic/smg/vector{ + pixel_x = 0; + pixel_y = 4 + }, +/obj/item/gun/ballistic/automatic/smg/vector{ + pixel_x = 0; + pixel_y = -2 + }, +/obj/item/gun/energy/e_gun/hades{ + pixel_x = -1; + pixel_y = -9; + cell_type = /obj/item/stock_parts/cell/gun + }, +/obj/item/gun/energy/e_gun/iot{ + pixel_x = 0; + pixel_y = 13 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "gN" = ( /obj/machinery/light/dim/directional/north, /obj/machinery/power/terminal, @@ -680,11 +857,28 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "hf" = ( -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/dark, +/obj/item/stamp/hos{ + pixel_x = 3; + pixel_y = -4 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 11; + layer = 4.2 + }, +/obj/machinery/recharger{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/structure/railing{ + dir = 1; + layer = 2.7 + }, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/ship/security) "hk" = ( /obj/structure/cable{ @@ -693,43 +887,41 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-10" }, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "hl" = ( /obj/structure/cable/cyan{ icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "hn" = ( /obj/effect/turf_decal/corner/opaque/orange/full, -/obj/structure/railing/corner, /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/turf_decal/siding/yellow, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"hp" = ( /obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 + dir = 2; + layer = 4.1 }, /turf/open/floor/plasteel/tech, -/area/ship/cargo) +/area/ship/engineering) +"hp" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security/armory) "hx" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/siding/wood, @@ -737,7 +929,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "hz" = ( /obj/docking_port/mobile{ dir = 2; @@ -768,7 +960,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "hK" = ( /obj/structure/grille, @@ -788,31 +980,33 @@ /turf/open/floor/engine/hull, /area/ship/external) "hQ" = ( -/turf/open/floor/plasteel/stairs/wood{ - dir = 8 +/obj/machinery/door/airlock/security{ + dir = 4; + name = "Prison" }, +/turf/open/floor/plasteel/dark, /area/ship/security) -"hZ" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 13; - layer = 4.2 - }, -/obj/effect/turf_decal/siding/wood/end{ +"hY" = ( +/obj/machinery/light/dim/directional/south, +/obj/structure/filingcabinet/double{ dir = 1 }, -/obj/item/toy/plush/moth/deadhead{ - pixel_x = -7; - layer = 4.3 +/obj/item/documents/nanotrasen, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"hZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/turf/open/floor/wood, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) "ib" = ( /obj/structure/cable/cyan{ icon_state = "5-10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "id" = ( @@ -849,19 +1043,18 @@ /obj/effect/decal/cleanable/glass, /obj/machinery/light_switch{ dir = 1; - pixel_x = 7; - pixel_y = -20 + pixel_x = 12; + pixel_y = -16 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "iq" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plating, -/area/ship/maintenance/port) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/medical) "ix" = ( /obj/structure/table/greyscale, /obj/effect/turf_decal/siding/blue{ @@ -886,6 +1079,7 @@ dir = 4 }, /obj/effect/decal/cleanable/robot_debris/old, +/obj/machinery/space_heater, /turf/open/floor/plating, /area/ship/maintenance/starboard) "iD" = ( @@ -901,7 +1095,7 @@ /obj/machinery/camera/autoname{ dir = 10 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "iF" = ( /obj/structure/railing{ @@ -912,9 +1106,6 @@ }, /obj/effect/turf_decal/steeldecal/steel_decals4, /obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, /obj/effect/spawner/lootdrop/lpaid{ pixel_x = -5; pixel_y = 10 @@ -923,12 +1114,31 @@ pixel_x = 3; pixel_y = 1 }, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel/dark, /area/ship/bridge) "iH" = ( -/obj/structure/bed, -/obj/item/bedsheet/grey, -/turf/open/floor/plasteel/dark, +/obj/structure/closet/secure_closet/lp/security, +/obj/item/melee/classic_baton/telescopic, +/obj/item/flashlight/seclite, +/obj/item/melee/knife/survival, +/obj/item/holosign_creator/security, +/obj/item/storage/box/handcuffs, +/obj/item/restraints/legcuffs/bola/energy, +/obj/item/holosign_creator/security, +/obj/item/clothing/mask/gas/sechailer, +/obj/item/gps{ + gpstag = "SEC0" + }, +/obj/item/storage/belt/security/webbing, +/obj/item/clothing/glasses/hud/security/sunglasses, +/obj/item/gun/energy/e_gun/adv_stopping, +/obj/item/stock_parts/cell/gun{ + layer = 3.1 + }, +/obj/item/clothing/head/helmet/blueshirt, +/obj/item/clothing/suit/armor/vest/blueshirt, +/turf/open/floor/wood, /area/ship/security) "iI" = ( /obj/structure/closet/emcloset/wall/directional/north, @@ -941,8 +1151,15 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) +"iV" = ( +/obj/machinery/light/dim/directional/west, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine/hull, +/area/ship/external) "iX" = ( /obj/effect/turf_decal/siding/yellow{ dir = 10 @@ -958,7 +1175,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "jb" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ @@ -970,25 +1187,36 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/mopbucket, -/obj/item/mop, -/turf/open/floor/plasteel/white, +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "jj" = ( /obj/machinery/holopad/emergency, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/trimline/opaque/ntblue, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "jk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "jr" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/lp/engi, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/emergency_oxygen, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/item/bodypart/leg/right/robot, +/obj/item/bodypart/r_arm/robot, +/obj/item/bodypart/leg/left/robot, +/obj/item/bodypart/l_arm/robot, +/obj/item/bodypart/chest/robot, +/obj/item/bodypart/head/robot, +/obj/item/borg/upgrade/ai, +/obj/item/robot_suit, +/obj/structure/closet/crate/engineering, +/obj/effect/turf_decal/industrial/hatch/orange, +/obj/item/stock_parts/cell/high, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/structure/sign/poster/official/random{ + pixel_x = 0; + pixel_y = 32 }, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) @@ -997,34 +1225,25 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "jt" = ( -/obj/machinery/autolathe, /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/machinery/recharge_station, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "jv" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/hooded/wintercoat/security, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/head/beret/sec, -/obj/item/clothing/under/rank/security/head_of_security/nt/lp, -/obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp, -/obj/item/clothing/suit/armor/vest/security/officer, -/obj/item/clothing/under/rank/security/head_of_security/alt/lp, -/obj/machinery/light/dim/directional/west, -/turf/open/floor/wood, +/obj/machinery/computer/arcade/orion_trail, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "jA" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/port) "jC" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 8 - }, -/turf/open/floor/engine/hull, -/area/ship/external) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/dorm/captain) "jF" = ( /obj/effect/turf_decal/corner/opaque/orange/full, /obj/structure/cable{ @@ -1049,7 +1268,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "jZ" = ( /obj/structure/cable{ @@ -1061,10 +1280,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/corner/opaque/brown/full, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "kh" = ( /obj/machinery/light_switch{ dir = 1; @@ -1072,27 +1290,49 @@ pixel_y = -20 }, /obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) +"kj" = ( +/turf/open/floor/wood, +/area/ship/security) "ks" = ( /obj/effect/decal/cleanable/cobweb, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, /area/ship/maintenance/port) "kt" = ( -/obj/effect/turf_decal/borderfloorblack, -/turf/open/floor/plasteel/tech/airless, -/area/ship/engineering/communications) +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "kw" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + name = "Intelligence Core"; + id = "AiCore" + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "kK" = ( /obj/structure/table/wood, /obj/item/storage/box/cups, /obj/machinery/light/dim/directional/south, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "kO" = ( /obj/structure/cable{ @@ -1102,7 +1342,7 @@ icon_state = "2-5" }, /obj/effect/turf_decal/corner/opaque/ntblue, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "kQ" = ( /obj/structure/grille, @@ -1121,6 +1361,10 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"kV" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/maintenance/port) "lc" = ( /obj/structure/railing/modern/end{ dir = 8; @@ -1148,7 +1392,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "lp" = ( /obj/machinery/button/door{ @@ -1169,22 +1413,49 @@ dir = 4 }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "lv" = ( -/obj/effect/decal/cleanable/insectguts, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = 12 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/trimline/opaque/purple/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "lw" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/closet/crate/large, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/machinery/suit_storage_unit/inherit, +/obj/machinery/door/window/brigdoor, +/obj/structure/window/reinforced/spawner{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/blue/half{ + dir = 1 + }, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/hardsuit/ert/lp/med{ + slowdown = 0.3 + }, +/obj/item/clothing/mask/breath/medical, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "lB" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "lD" = ( /obj/structure/cable{ @@ -1204,23 +1475,32 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "lU" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/corner/opaque/red/half{ dir = 1 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = 7 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"lW" = ( -/obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/effect/turf_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/structure/window/reinforced/spawner{ + dir = 1 }, +/obj/structure/closet/wall/red/directional/west{ + name = "equipment locker" + }, +/obj/item/storage/belt/military/assault, +/obj/item/storage/belt/military/assault, +/obj/item/storage/belt/military/assault, +/obj/item/clothing/suit/armor/vest/bulletproof, +/obj/item/clothing/suit/armor/vest/bulletproof, +/obj/item/clothing/suit/armor/vest/bulletproof, +/obj/item/clothing/head/helmet/bulletproof, +/obj/item/clothing/head/helmet/bulletproof, +/obj/item/clothing/head/helmet/bulletproof, +/obj/effect/turf_decal/trimline/opaque/vired/warning, +/obj/item/clothing/glasses/sunglasses/ballistic, +/obj/item/clothing/glasses/sunglasses/ballistic, +/obj/item/clothing/glasses/sunglasses/ballistic, /turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"lW" = ( +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "lX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1228,10 +1508,6 @@ }, /obj/effect/turf_decal/corner/opaque/orange/full, /obj/effect/turf_decal/siding/yellow, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, /obj/effect/turf_decal/siding/yellow, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -1246,7 +1522,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "ml" = ( /obj/structure/cable{ @@ -1258,25 +1534,22 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/corner/opaque/ntblue/half, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "mn" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/modular_computer/laptop/preset/civilian, /obj/machinery/light/dim/directional/north, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 1 + }, +/obj/machinery/modular_computer/console/preset/command, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "mv" = ( -/obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/mob/living/simple_animal/pet/dog/corgi/Lisa, -/obj/structure/bed/dogbed, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "mw" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 @@ -1284,19 +1557,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light/dim/directional/west, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "my" = ( -/obj/structure/urinal{ - pixel_y = 29 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/structure/closet/cabinet, +/obj/item/clothing/head/nanotrasen/cap/janitor, +/obj/item/clothing/under/nanotrasen/janitor, +/obj/item/clothing/suit/bio_suit/janitor, +/obj/item/clothing/head/bio_hood/janitor, +/obj/item/clothing/gloves/color/purple, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/head/maidheadband, +/obj/item/clothing/gloves/maid/white, +/obj/item/clothing/accessory/maidapron, +/obj/item/clothing/under/costume/maid, +/obj/item/clothing/under/rank/civilian/janitor/maid, +/obj/item/storage/backpack/ert/janitor, +/turf/open/floor/plasteel, +/area/ship/crew/janitor) "mJ" = ( -/obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light_switch{ dir = 4; @@ -1306,13 +1585,18 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/effect/turf_decal/trimline/opaque/brown/line, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "mQ" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "nh" = ( @@ -1320,12 +1604,6 @@ dir = 1 }, /obj/effect/turf_decal/siding/red, -/obj/machinery/door/window/brigdoor{ - req_ship_access = 1; - req_access_txt = "1"; - id = "ranger_brig"; - name = "Holding Cell Door" - }, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "no" = ( @@ -1338,12 +1616,17 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) +"nu" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/maintenance/starboard) "nA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "nE" = ( /obj/machinery/button/door{ @@ -1359,7 +1642,13 @@ pixel_y = 20; id = "AI_Core_Field_Engi" }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "nJ" = ( /obj/structure/cable/cyan{ @@ -1381,12 +1670,15 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "of" = ( -/obj/machinery/light/dim/directional/south, /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/white, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "og" = ( /obj/structure/railing{ @@ -1396,12 +1688,9 @@ dir = 8; icon_state = "computer-right" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "oi" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "ok" = ( @@ -1423,6 +1712,10 @@ /obj/structure/cable/cyan{ icon_state = "5-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "or" = ( @@ -1430,12 +1723,15 @@ /turf/open/floor/plating, /area/ship/engineering) "ox" = ( -/obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/blue/corner, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "oz" = ( -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "oI" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -1454,16 +1750,15 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "oM" = ( -/obj/machinery/door/window/eastleft{ - dir = 2 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/turf/open/floor/plasteel, +/area/ship/crew/janitor) "oQ" = ( -/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/ship/medical) "pa" = ( @@ -1473,8 +1768,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "pf" = ( /obj/structure/closet/emcloset/wall/directional/south, @@ -1486,33 +1780,38 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "pi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/structure/sign/poster/official/random{ + pixel_x = 0; + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "pn" = ( /obj/structure/chair/wood, /obj/item/toy/figure/assistant{ layer = 3.1 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "pp" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 13; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = 24 +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/opaque/lightgrey, +/obj/effect/turf_decal/siding/purple{ + dir = 4 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/machinery/light/dim/directional/east, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "ps" = ( /obj/structure/closet/secure_closet/lp/engineer, /obj/machinery/light/dim/directional/north, @@ -1549,27 +1848,34 @@ /obj/item/clothing/head/welding{ pixel_y = -9 }, -/obj/item/clothing/glasses/meson/gar{ - pixel_y = 8 - }, +/obj/item/clothing/glasses/meson/sunglasses, +/obj/item/storage/belt/utility/full/engi, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "pA" = ( /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, /turf/open/floor/plasteel/stairs{ dir = 1 }, /area/ship/bridge) "pD" = ( -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "pL" = ( /obj/structure/chair/comfy/blue/directional/east, /obj/item/toy/plush/moth/royal, /obj/item/radio/intercom/wideband/directional/south, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "pU" = ( /obj/machinery/camera/autoname{ @@ -1579,29 +1885,52 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "qb" = ( -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/industrial/outline/blue, -/obj/structure/janitorialcart{ - dir = 4 +/obj/effect/decal/cleanable/glass, +/obj/structure/closet/crate/large, +/obj/item/storage/backpack/ert/clown, +/obj/item/clothing/shoes/clown_shoes, +/obj/item/clothing/under/rank/civilian/clown, +/obj/item/clothing/mask/gas/clown_hat{ + pixel_x = 0; + pixel_y = 12 }, -/obj/item/mop, -/turf/open/floor/plating, +/obj/item/grown/bananapeel, +/obj/effect/turf_decal/industrial/outline/blue, +/turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "qe" = ( -/obj/structure/urinal{ - pixel_y = 29 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/camera/autoname, +/obj/item/clothing/suit/armor/vest, +/obj/item/storage/bag/trash, +/obj/item/holosign_creator/janibarrier, +/obj/structure/closet/l3closet/janitor{ + name = "janitorial specialist's locker" + }, +/obj/item/storage/belt/janitor/full, +/obj/item/clothing/shoes/galoshes, +/obj/item/watertank/janitor, +/obj/item/melee/flyswatter, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop/advanced, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/flashlight/seclite, +/obj/item/gps/science{ + gpstag = "JAN0" + }, +/obj/item/storage/belt/janitor/full, +/obj/item/clothing/glasses/sunglasses/chemical, +/turf/open/floor/plasteel, +/area/ship/crew/janitor) "qs" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -1618,7 +1947,6 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "qR" = ( -/obj/machinery/door/airlock/security/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -1629,6 +1957,9 @@ }, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/corner/opaque/red/full, +/obj/machinery/door/airlock/security/glass{ + name = "Security specialist's room" + }, /turf/open/floor/plasteel/dark, /area/ship/security) "qS" = ( @@ -1637,21 +1968,20 @@ }, /obj/effect/decal/cleanable/oil/streak, /obj/machinery/light/dim/directional/north, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ship/maintenance/port) "qZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, +/obj/effect/turf_decal/corner/opaque/brown/full, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "rg" = ( -/obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/trimline/opaque/brown/line, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "rq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1666,6 +1996,8 @@ }, /obj/effect/turf_decal/siding/yellow, /obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner, /turf/open/floor/plasteel/tech, /area/ship/engineering) "rC" = ( @@ -1690,7 +2022,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "rM" = ( /obj/structure/cable{ @@ -1705,7 +2037,8 @@ /obj/effect/turf_decal/trimline/opaque/orange/arrow_cw{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/starboard) "rT" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -1714,7 +2047,10 @@ pixel_x = -7; pixel_y = -19 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "rW" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -1736,19 +2072,15 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "rZ" = ( /obj/effect/turf_decal/atmos/air, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/engine/air, /area/ship/hallway/central) "sf" = ( @@ -1756,17 +2088,21 @@ dir = 8; layer = 4.1 }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, /obj/machinery/fax/nanotrasen, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 1 + }, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel/dark, /area/ship/bridge) "sl" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "sm" = ( /obj/structure/cable{ @@ -1791,7 +2127,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "sF" = ( /obj/structure/table/greyscale, @@ -1810,20 +2146,24 @@ pixel_x = 5 }, /obj/machinery/light/dim/directional/north, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_x = -5; + pixel_y = -4 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "sJ" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "sR" = ( -/obj/structure/table/wood, /obj/machinery/light/dim/directional/south, /obj/effect/turf_decal/siding/red/end, -/obj/item/toy/plush/spider, +/obj/machinery/computer/security{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "sU" = ( -/obj/structure/table/greyscale, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ icon_state = "0-10" @@ -1831,9 +2171,15 @@ /obj/effect/turf_decal/siding/blue{ dir = 5 }, -/obj/item/defibrillator/loaded, +/obj/item/defibrillator/compact/combat/loaded/nanotrasen, +/obj/structure/table/reinforced/glass, /turf/open/floor/plasteel/white, /area/ship/medical) +"sY" = ( +/obj/effect/turf_decal/corner/opaque/brown/full, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) "tb" = ( /obj/structure/table/wood, /obj/machinery/light/dim/directional/north, @@ -1862,7 +2208,7 @@ /obj/structure/cable{ icon_state = "4-10" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "tg" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -1873,10 +2219,11 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) +"th" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/janitor) "tj" = ( -/obj/machinery/door/airlock/command{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -1892,16 +2239,39 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/command{ + dir = 4; + name = "Bridge"; + req_one_access_txt = list(50, 10, 5, 1, 20) + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "tk" = ( /obj/effect/turf_decal/corner/opaque/orange/full, -/obj/effect/turf_decal/siding/yellow, +/obj/structure/railing{ + dir = 2; + layer = 4.1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "tq" = ( /obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/item/bedsheet/cmo, +/obj/structure/curtain/cloth/fancy, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/ship/medical) "tr" = ( @@ -1910,6 +2280,15 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"tw" = ( +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/obj/machinery/photocopier, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "tK" = ( /obj/structure/railing{ dir = 4 @@ -1919,8 +2298,18 @@ icon_state = "computer-left" }, /obj/machinery/newscaster/directional/north, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) +"tO" = ( +/obj/machinery/light/dim/directional/west, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "tQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1943,10 +2332,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "tT" = ( -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "tZ" = ( /obj/machinery/button/door{ @@ -1955,19 +2346,16 @@ name = "Shutters"; id = "Ranger_SB_maint_shut" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "uk" = ( -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/clothing/mask/breath, -/obj/structure/closet/emcloset/empty{ - name = "emergency EVA gear" - }, -/obj/item/tank/internals/emergency_oxygen, /obj/effect/turf_decal/siding/yellow{ dir = 5 }, +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "up" = ( @@ -1985,6 +2373,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech, /area/ship/engineering) "us" = ( @@ -1995,16 +2384,18 @@ /area/ship/hallway/central) "ux" = ( /obj/machinery/light/dim/directional/south, -/obj/machinery/telecomms/relay{ - freq_listening = list(1353,1447,1459); - id = "Nanotrasen Relay"; - name = "Nanotrasen relay"; - network = "nt_commnet" - }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/machinery/telecomms/relay/preset/nanotrasen, +/obj/effect/turf_decal/techfloor{ + dir = 1 }, +/turf/open/floor/circuit, /area/ship/engineering/communications) +"uD" = ( +/obj/machinery/porta_turret/ship/faction/nanotrasen{ + dir = 5 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/bridge) "uE" = ( /obj/structure/cable{ icon_state = "5-8" @@ -2014,7 +2405,7 @@ }, /obj/effect/turf_decal/corner/opaque/ntblue/half, /obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "uH" = ( /obj/machinery/door/airlock/public/glass, @@ -2027,7 +2418,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "uW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2037,7 +2428,6 @@ dir = 4 }, /obj/effect/turf_decal/siding/blue, -/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/ship/medical) "vh" = ( @@ -2054,28 +2444,41 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "vk" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 13; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = 24 - }, /obj/machinery/light_switch{ pixel_x = -7; pixel_y = 21 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "vm" = ( -/turf/closed/wall/r_wall, +/obj/structure/closet/secure_closet/lp/medical, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, +/obj/item/storage/belt/medical, +/obj/item/flashlight/seclite, +/obj/item/roller, +/obj/item/holosign_creator/medical, +/obj/item/pinpointer/crew, +/obj/item/storage/box/bodybags, +/obj/item/storage/firstaid/regular, +/obj/item/clothing/glasses/hud/health/sunglasses, +/obj/item/roller{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/roller{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/sensor_device, +/obj/item/storage/box/hypospray, +/turf/open/floor/wood, /area/ship/medical) "vp" = ( /obj/effect/turf_decal/steeldecal/steel_decals10{ @@ -2084,28 +2487,35 @@ /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 6 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "vr" = ( -/obj/structure/window/reinforced{ +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/engine/air, /area/ship/hallway/central) "vv" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security) "vz" = ( -/obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/light/dim/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/vired/half, +/obj/structure/closet/secure_closet{ + icon_state = "armory"; + name = "ammunition locker" + }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/obj/item/stock_parts/cell/gun, +/obj/item/stock_parts/cell/gun, +/obj/item/stock_parts/cell/gun, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "vB" = ( /obj/machinery/cryopod, /obj/machinery/camera/autoname, @@ -2113,15 +2523,18 @@ /area/ship/crew/cryo) "vF" = ( /obj/effect/turf_decal/siding/blue, -/obj/structure/closet/crate/freezer/blood, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/optable, /turf/open/floor/plasteel/white, /area/ship/medical) "vO" = ( -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "vR" = ( /obj/machinery/light/dim/directional/south, @@ -2134,15 +2547,14 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "vS" = ( -/obj/structure/table/optable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/siding/blue, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/ship/medical) "vT" = ( @@ -2170,14 +2582,21 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/lp/med, -/obj/item/clothing/mask/breath, /obj/machinery/camera/autoname, /obj/effect/turf_decal/siding/blue{ dir = 5 }, -/obj/item/tank/internals/emergency_oxygen, +/obj/structure/closet/crate/medical{ + name = "anesthetics crate" + }, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath/medical, /turf/open/floor/plasteel/white, /area/ship/medical) "wc" = ( @@ -2197,14 +2616,11 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "wf" = ( -/obj/machinery/telecomms/receiver/preset_right{ - autolinkers = list("receiverB","hub"); - freq_listening = list(1353,1447,1459); - network = "nt_commnet" - }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/effect/turf_decal/techfloor/hole/right, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "wh" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ @@ -2219,11 +2635,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/ship/hallway/starboard) "wp" = ( -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, /obj/item/clothing/mask/breath, /obj/item/tank/internals/emergency_oxygen, /obj/structure/closet/emcloset/empty{ @@ -2241,25 +2656,32 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/corner/opaque/brown/full, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "ww" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/stand_clear{ +/obj/effect/turf_decal/corner/opaque/red/half{ dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/trimline/opaque/vired/warning, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "wC" = ( /obj/effect/turf_decal/steeldecal/steel_decals6, -/obj/effect/turf_decal/borderfloorblack{ - dir = 6 +/obj/machinery/telecomms/receiver/preset_right{ + autolinkers = list("receiverB","hub"); + freq_listening = list(1353,1447,1459); + network = "nt_commnet" }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "wE" = ( /obj/machinery/button/door{ @@ -2272,7 +2694,10 @@ pixel_x = 8; id = "Ranger_Port_holofields" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "wT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2282,26 +2707,32 @@ dir = 4 }, /obj/effect/turf_decal/trimline/opaque/red/filled/corner, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "wU" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 19; - pixel_y = 8 +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering) +"xf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/table/wood, +/obj/item/toy/plush/moth/deadhead{ + pixel_x = -9; + layer = 4.3; + pixel_y = 3 }, -/obj/effect/turf_decal/corner/opaque/orange/full, -/obj/effect/turf_decal/siding/yellow{ - dir = 6 +/obj/item/flashlight/lamp/green{ + pixel_x = 7; + pixel_y = 15; + layer = 4.2 }, -/obj/structure/railing{ - dir = 2; - layer = 4.1 +/obj/machinery/cell_charger{ + pixel_x = 4; + pixel_y = -1 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/wood, /area/ship/engineering) "xj" = ( /obj/structure/cable{ @@ -2312,12 +2743,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/ntblue/filled/line, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/corner/opaque/grey/border, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "xp" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/medical) "xq" = ( @@ -2325,57 +2760,64 @@ /turf/open/floor/plating, /area/ship/engineering) "xv" = ( -/obj/machinery/recharge_station, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/white, +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor, +/obj/item/soap/nanotrasen, +/turf/open/floor/plastic, /area/ship/crew/toilet) "xw" = ( /obj/structure/table/wood, /obj/machinery/microwave, /obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "xA" = ( -/obj/structure/tank_dispenser/oxygen, /obj/machinery/light/dim/directional/west, /obj/effect/turf_decal/siding/yellow{ dir = 4 }, +/obj/structure/closet/emcloset/empty{ + name = "emergency EVA gear" + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "xB" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, /obj/structure/cable/cyan{ icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "xK" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/folder/blue{ - pixel_x = -6 - }, -/obj/item/folder/red{ - pixel_y = 2 +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 4 }, -/obj/item/folder{ - pixel_y = 5; - pixel_x = 7 +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/recharger, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"xL" = ( +/obj/machinery/porta_turret/ship/faction/nanotrasen{ + dir = 6 }, -/turf/open/floor/plasteel/dark, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "yi" = ( /obj/effect/turf_decal/industrial/warning, @@ -2402,6 +2844,10 @@ /area/ship/engineering) "ym" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "yo" = ( @@ -2410,7 +2856,7 @@ dir = 1 }, /obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "yA" = ( /obj/machinery/telecomms/hub{ @@ -2418,45 +2864,69 @@ id = "Nanotrasen Communications Hub"; autolinkers = list("hub","bus","relay","messaging","nanotrasen","broadcasterB","receiverB") }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/effect/turf_decal/techfloor{ + dir = 1 }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "yC" = ( -/obj/structure/toilet{ - dir = 1 +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-1" }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "yK" = ( -/obj/item/soap/nanotrasen, -/obj/structure/window/reinforced/tinted/frosted{ +/obj/structure/bed, +/obj/structure/railing{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/ship/crew/toilet) +/obj/item/bedsheet/purple, +/turf/open/floor/plasteel, +/area/ship/crew/janitor) +"yQ" = ( +/obj/machinery/porta_turret/ship/faction/nanotrasen{ + dir = 10 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/bridge) "yU" = ( /obj/structure/table/reinforced, -/obj/item/storage/belt/utility, -/obj/item/t_scanner{ - pixel_x = 7; - pixel_y = 4 +/obj/machinery/light/dim/directional/south, +/obj/structure/railing{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = -2 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = 3; + pixel_y = 7 }, -/obj/item/weldingtool{ - pixel_x = -6 +/obj/item/stamp/ce{ + pixel_x = -9; + pixel_y = 8 }, -/obj/item/stack/cable_coil/random, -/obj/item/multitool, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "yZ" = ( -/obj/structure/reagent_dispensers/watertank, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ icon_state = "0-9" }, +/obj/machinery/computer/cargo{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/brown/warning, +/obj/effect/turf_decal/trimline/opaque/brown/line{ + dir = 1 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "zc" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2471,7 +2941,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "zi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -2484,19 +2954,22 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) -"zB" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/machinery/door/window{ +"zt" = ( +/obj/machinery/porta_turret/ship/faction/nanotrasen{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/turf/open/floor/engine/hull, +/area/ship/bridge) +"zB" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 10 }, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "zC" = ( /obj/structure/cable{ @@ -2508,24 +2981,25 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - name = "Cargo Bay"; - id = "Ranger_Cargo_Door" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + name = "Armory"; + id = "Ranger_Armory_Door" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "zF" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "zW" = ( /turf/template_noop, @@ -2534,35 +3008,58 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Av" = ( -/obj/structure/table/wood, /obj/item/toy/cards/deck{ pixel_x = -1; pixel_y = 10 }, -/turf/open/floor/plasteel/dark, +/obj/structure/table/reinforced/titaniumglass, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Aw" = ( -/obj/machinery/newscaster/directional/west, -/turf/open/floor/wood, -/area/ship/medical) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/royalblue, +/area/ship/crew/dorm/captain) +"Ay" = ( +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"AE" = ( +/obj/machinery/light/floor, +/obj/machinery/camera/autoname, +/turf/open/floor/engine/hull, +/area/ship/external) "AF" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /obj/machinery/light/dim/directional/north, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "AH" = ( -/obj/effect/turf_decal/borderfloorblack/corner{ - dir = 8 +/obj/machinery/camera/autoname{ + dir = 5 }, -/obj/effect/turf_decal/steeldecal/steel_decals7{ +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ dir = 1 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "AP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2574,19 +3071,26 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "AT" = ( /obj/effect/turf_decal/industrial/outline/blue, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ship/maintenance/port) +"AU" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "AZ" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "Be" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/light/dim/directional/south, /obj/machinery/button/door{ dir = 4; @@ -2595,8 +3099,13 @@ pixel_x = -22; pixel_y = 6 }, +/obj/effect/turf_decal/trimline/opaque/brown/warning, +/obj/machinery/autolathe, +/obj/effect/turf_decal/trimline/opaque/brown/line{ + dir = 1 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "Bg" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 8; @@ -2624,13 +3133,10 @@ /obj/effect/turf_decal/trimline/opaque/orange/arrow_ccw{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/starboard) "Bo" = ( /obj/effect/turf_decal/steeldecal/steel_decals4, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 1 }, @@ -2640,19 +3146,46 @@ /obj/effect/turf_decal/steeldecal/steel_decals6{ dir = 8 }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + layer = 2.040 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "BA" = ( -/obj/machinery/shower{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/stamp{ + pixel_x = -9; + pixel_y = 8 }, -/obj/structure/curtain, -/obj/item/bikehorn/rubberducky, -/turf/open/floor/plasteel/white, -/area/ship/crew/toilet) +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = 13; + pixel_y = 3 + }, +/obj/item/toy/plush/moth/clockwork, +/obj/item/clothing/head/bio_hood/janitor{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ship/crew/janitor) "BI" = ( -/obj/machinery/door/airlock/wood, -/turf/open/floor/plasteel/white, +/obj/machinery/door/window/eastleft{ + dir = 2 + }, +/obj/item/bikehorn/rubberducky, +/obj/machinery/airalarm/directional/west, +/obj/machinery/light/dim/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plastic, /area/ship/crew/toilet) "BO" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -2676,8 +3209,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/closet/firecloset/wall/directional/west, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "BY" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ @@ -2689,7 +3221,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Ca" = ( /obj/effect/turf_decal/corner/opaque/orange/full, @@ -2715,46 +3247,43 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/light/dim/directional/west, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Cg" = ( /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Cq" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/aicard, +/obj/item/wrench/crescent, +/turf/open/floor/circuit, /area/ship/engineering/communications) "Ct" = ( -/obj/structure/table/greyscale, /obj/machinery/light/dim/directional/east, /obj/effect/turf_decal/siding/blue{ dir = 6 }, -/obj/item/roller{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/roller{ - pixel_x = -3; - pixel_y = 7 - }, +/obj/structure/closet/crate/freezer/blood, /turf/open/floor/plasteel/white, /area/ship/medical) "CB" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 10 }, -/obj/effect/turf_decal/techfloor/hole/right, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "CD" = ( /obj/effect/turf_decal/corner/opaque/orange/border{ @@ -2766,7 +3295,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/starboard) "CG" = ( /obj/machinery/door/airlock/public/glass, @@ -2779,7 +3309,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "CI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -2801,9 +3331,7 @@ dir = 8; layer = 2 }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/structure/window/plasma/reinforced/spawner/west, /turf/open/floor/engine/air, /area/ship/hallway/central) "CP" = ( @@ -2812,9 +3340,13 @@ }, /turf/open/floor/engine/hull, /area/ship/external) +"CT" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security) "Dd" = ( -/obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/industrial/outline/orange, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "Dr" = ( @@ -2837,7 +3369,6 @@ /obj/machinery/camera/autoname{ dir = 6 }, -/obj/effect/turf_decal/borderfloorblack/corner, /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 1 }, @@ -2847,22 +3378,25 @@ /obj/effect/turf_decal/steeldecal/steel_decals6{ dir = 8 }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1; + layer = 2.040 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "Dx" = ( -/turf/open/floor/plasteel/dark, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, /area/ship/security) "DE" = ( -/obj/item/storage/box/metalfoam, -/obj/item/watertank/atmos, -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/brown/mono, /obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, +/obj/effect/turf_decal/corner/opaque/brown/full, +/obj/structure/crate_shelf, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "DW" = ( /obj/structure/cable/cyan{ icon_state = "0-4" @@ -2874,26 +3408,40 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "DZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -20; - name = "Cargo Bay Shutters"; - id = "Ranger_Cargo_Door"; - pixel_y = 1 +/obj/machinery/suit_storage_unit/inherit, +/obj/machinery/door/window/brigdoor, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/item/clothing/suit/space/hardsuit/ert/lp, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/clothing/mask/gas/sechailer/swat, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"Eh" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "Ek" = ( /obj/machinery/computer/telecomms/server, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 1 + }, +/obj/machinery/turretid/lethal{ + pixel_x = -1; + pixel_y = 25 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "Eq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/full, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "EL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -2902,12 +3450,25 @@ /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "EP" = ( -/obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/dark, +/obj/structure/table/wood, +/obj/structure/closet/secure_closet/freezer/wall/directional/east, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/effect/decal/cleanable/food/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker/large, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) +"ES" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/cryo) "Ff" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2915,18 +3476,18 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Fg" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/lp, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/emergency_oxygen, /obj/effect/turf_decal/siding/wood/end{ dir = 4 }, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/pet/dog/corgi/puppy{ + real_name = "Intern" + }, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Fh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 9 @@ -2952,11 +3513,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/door/airlock/wood, +/obj/machinery/door/airlock/glass{ + name = "Janitorial Specialist's Office" + }, /turf/open/floor/plasteel/white, -/area/ship/crew/toilet) +/area/ship/crew/janitor) "Fx" = ( -/obj/structure/table/wood, /obj/item/storage/box/matches{ pixel_y = 4 }, @@ -2968,7 +3530,11 @@ pixel_y = 2; pixel_x = -5 }, -/turf/open/floor/plasteel/dark, +/obj/structure/table/reinforced/titaniumglass, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "FB" = ( /obj/structure/cable{ @@ -2977,18 +3543,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/orange/full, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plasteel/tech, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering Sector" + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering) +"FI" = ( +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/vired/warning, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "FQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3008,17 +3587,22 @@ /obj/item/clothing/under/rank/security/head_of_security/alt/lp, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/suit/jacket/miljacket, -/obj/item/clothing/suit/jacket/leather/duster/command, /obj/item/storage/backpack/messenger/com, -/obj/item/storage/backpack/satchel/cap, -/obj/item/storage/backpack/captain, /obj/item/storage/backpack/duffelbag/captain, +/obj/machinery/light/dim/directional/north, +/obj/item/storage/backpack/satchel/cap, +/obj/item/storage/backpack/ert, /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/light/dim/directional/north, +/obj/item/clothing/head/nanotrasen/beret, +/obj/item/clothing/suit/armor/nanotrasen/captain/parade, +/obj/item/clothing/suit/armor/nanotrasen/captain, +/obj/item/clothing/head/nanotrasen/captain, +/obj/item/clothing/under/nanotrasen/captain/skirt, +/obj/item/clothing/neck/cloak/nanotrasen, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Ge" = ( /obj/structure/cable{ icon_state = "0-8" @@ -3028,6 +3612,12 @@ /obj/effect/turf_decal/industrial/outline/orange, /turf/open/floor/plating, /area/ship/engineering) +"Gf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/engine/hull, +/area/ship/external) "Gh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3035,11 +3625,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/light/floor, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Gk" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ @@ -3051,31 +3638,23 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/closet/emcloset/wall/directional/west, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Gn" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/toy/plush/moth/snow{ - pixel_x = -3 - }, -/turf/open/floor/wood, -/area/ship/medical) +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering/communications) "Gz" = ( -/obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 4 }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "GC" = ( /obj/structure/window/reinforced/spawner{ @@ -3102,42 +3681,41 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "GY" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/effect/turf_decal/siding/wood, /obj/item/radio/intercom/directional/south, +/obj/structure/bed, +/obj/item/bedsheet/ce, +/obj/structure/curtain/cloth/fancy, /turf/open/floor/wood, /area/ship/engineering) "Ha" = ( /obj/structure/closet/secure_closet/lp/lieutenant, -/obj/item/gun/energy/e_gun{ - pixel_y = 1 - }, -/obj/item/stock_parts/cell/gun, /obj/item/melee/classic_baton/telescopic, -/obj/item/melee/knife/survival, /obj/item/gps, /obj/item/screwdriver, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, /obj/machinery/light_switch{ dir = 1; pixel_x = 7; pixel_y = -20 }, -/obj/item/gun/ballistic/automatic/pistol/commander, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm/rubbershot, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm, +/obj/item/tank/jetpack/suit, +/obj/item/clothing/glasses/sunglasses, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/obj/item/storage/lockbox/medal, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/gun/ballistic/revolver/mateba, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Hd" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -3159,10 +3737,10 @@ dir = 4 }, /obj/effect/turf_decal/corner/opaque/orange/full, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/siding/yellow{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plasteel/tech, @@ -3178,7 +3756,8 @@ dir = 4 }, /obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/port) "HA" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ @@ -3211,6 +3790,9 @@ name = "Shutters"; id = "Ranger_Port_maint_shut" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Iy" = ( @@ -3234,12 +3816,19 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "Iz" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-10" +/obj/machinery/suit_storage_unit/inherit, +/obj/machinery/door/window/brigdoor, +/obj/structure/window/reinforced/spawner{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 1 + }, +/obj/item/tank/jetpack/oxygen/security, +/obj/item/clothing/suit/space/hardsuit/ert/lp/sec, +/obj/item/clothing/mask/gas/sechailer, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "IC" = ( /obj/effect/turf_decal/corner/opaque/orange/full, /obj/machinery/door/airlock/engineering/glass, @@ -3256,15 +3845,21 @@ /area/ship/engineering) "IE" = ( /obj/machinery/light/floor, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "IM" = ( -/obj/structure/chair/sofa/brown/directional/west, /obj/item/toy/plush/blahaj{ layer = 3.1 }, /obj/machinery/newscaster/directional/east, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/blue/directional/west, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "IQ" = ( /obj/machinery/cryopod, @@ -3277,30 +3872,37 @@ dir = 1 }, /obj/effect/turf_decal/corner/opaque/ntblue/half, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Ji" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/lp/sec, -/obj/item/clothing/mask/breath, /obj/machinery/light/dim/directional/east, /obj/effect/turf_decal/siding/red{ dir = 5 }, -/obj/item/tank/internals/emergency_oxygen, /obj/machinery/newscaster/directional/north{ pixel_x = -3 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "Js" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/siding/red{ dir = 8 }, /obj/effect/turf_decal/siding/red/corner, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) +"Ju" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, +/area/ship/engineering) "Jw" = ( /obj/structure/cable/cyan{ icon_state = "0-4" @@ -3311,18 +3913,23 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "JK" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/ship/engineering) +"JL" = ( +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/mirror{ - pixel_x = -25 +/obj/effect/turf_decal/trimline/opaque/blue/warning{ + dir = 1 }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/wood, -/area/ship/engineering) +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "JO" = ( /obj/machinery/door/airlock/command, /obj/structure/cable{ @@ -3333,7 +3940,7 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "JP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3349,15 +3956,18 @@ "JR" = ( /turf/closed/wall/r_wall, /area/ship/crew/cryo) +"Kc" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/dorm) "Kf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Kg" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/communications) "Kj" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ @@ -3367,38 +3977,59 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Kl" = ( -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/camera/autoname{ - dir = 5 +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) +"Kq" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/table/reinforced/titaniumglass, +/obj/item/paper_bin{ + pixel_y = 8; + pixel_x = 5 + }, +/obj/item/pen/fountain{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/stamp/nt/captain{ + pixel_x = -5; + pixel_y = -1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "Kt" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/trimline/opaque/blue, /turf/open/floor/plasteel/white, /area/ship/medical) "Kw" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "KC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, +/obj/effect/turf_decal/corner/opaque/brown/full, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "KQ" = ( /obj/structure/closet, /obj/item/pickaxe, @@ -3430,10 +4061,9 @@ /obj/effect/turf_decal/trimline/opaque/red/filled/corner{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Lg" = ( -/obj/structure/window/reinforced, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -3441,14 +4071,20 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "Lk" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "Lt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "Lu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3462,18 +4098,13 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/line{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Lw" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/turf/open/floor/wood, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) "LM" = ( /obj/machinery/telecomms/processor/preset_four{ @@ -3481,9 +4112,10 @@ network = "nt_commnet"; id = "Nanotrasen Communications Processor" }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/effect/turf_decal/techfloor{ + dir = 4 }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "LQ" = ( /obj/structure/cable{ @@ -3505,34 +4137,49 @@ /turf/open/floor/plating, /area/ship/bridge) "LV" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "Ma" = ( -/obj/structure/chair/wood, /obj/effect/turf_decal/siding/red{ dir = 4 }, /obj/effect/turf_decal/siding/red{ dir = 8 }, +/obj/structure/chair/comfy/beige, +/obj/item/toy/plush/moth/redish{ + pixel_x = 0; + layer = 4.3; + pixel_y = 4 + }, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "Mc" = ( -/obj/structure/toilet{ - dir = 1 +/obj/machinery/airalarm/directional/south, +/obj/structure/janitorialcart, +/obj/effect/turf_decal/siding/purple{ + dir = 6 }, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/plastic, -/area/ship/crew/toilet) +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/mineral/titanium/purple, +/area/ship/crew/janitor) "Md" = ( /obj/structure/AIcore, /obj/item/mmi/posibrain, /obj/item/circuitboard/aicore, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "Mf" = ( -/turf/closed/wall/r_wall, -/area/ship/crew/dorm) +/obj/machinery/firealarm/directional/north, +/obj/structure/bed, +/obj/item/bedsheet/nanotrasen, +/obj/structure/curtain/cloth/fancy, +/obj/item/toy/plush/celadon/beaver, +/turf/open/floor/carpet/royalblue, +/area/ship/crew/dorm/captain) "Mg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3546,11 +4193,14 @@ /obj/effect/turf_decal/trimline/opaque/orange/arrow_cw{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/starboard) "Mh" = ( /obj/machinery/computer/apc_control{ - dir = 4 + dir = 4; + icon_state = "computer-left" }, /obj/effect/turf_decal/techfloor, /turf/open/floor/plasteel/mono/dark, @@ -3559,12 +4209,12 @@ /obj/structure/cable{ icon_state = "5-8" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Mn" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/trimline/opaque/ntblue, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Ms" = ( /obj/machinery/button/door{ @@ -3572,25 +4222,32 @@ name = "Ranger Bridge Shutters"; id = "Ranger_Bridge_Shutters"; dir = 1; - pixel_x = 6 + pixel_x = 7 }, /obj/effect/turf_decal/techfloor{ dir = 8 }, /obj/effect/turf_decal/steeldecal/steel_decals4, -/turf/open/floor/plasteel/dark, +/obj/machinery/button/door{ + dir = 1; + pixel_x = -7; + pixel_y = -20; + id = "Ranger_Armory_Door"; + name = "Armory Shutters" + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "Mt" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/orange/full, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/orange/full, /obj/effect/turf_decal/siding/yellow{ dir = 1 }, @@ -3598,30 +4255,31 @@ /area/ship/engineering) "Mu" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/cigarettes/derringer/gold{ - pixel_x = -1; - pixel_y = -4 - }, -/obj/item/lighter{ - pixel_x = -10 - }, /obj/item/flashlight/lamp/green{ - pixel_x = 5; + pixel_x = 7; pixel_y = 13; layer = 4.2 }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/item/disk/nuclear/fake{ + pixel_x = -5; + pixel_y = -1 + }, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Mx" = ( /obj/machinery/light_switch{ dir = 8; pixel_x = 19; pixel_y = 8 }, -/turf/open/floor/plasteel/tech/airless, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "Mz" = ( /obj/effect/turf_decal/corner/opaque/orange/full, @@ -3652,10 +4310,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering) -"MD" = ( -/obj/item/disk/design_disk/ammo_c9mm, -/turf/open/floor/plating, -/area/ship/engineering) "MI" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -3667,18 +4321,12 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "MK" = ( -/obj/structure/table/reinforced, -/obj/item/aicard, -/obj/item/stack/sheet/rglass{ - amount = 25 - }, -/obj/item/wrench, -/obj/item/stack/cable_coil/cyan, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor, +/obj/machinery/camera/autoname, +/turf/open/floor/circuit, /area/ship/engineering/communications) "ML" = ( /obj/machinery/light/dim/directional/north, @@ -3691,7 +4339,10 @@ /obj/machinery/computer/helm{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "MY" = ( /obj/effect/turf_decal/corner/opaque/ntblue/border{ @@ -3706,7 +4357,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Nd" = ( /obj/structure/cable{ @@ -3716,6 +4367,9 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ship/engineering) "Nf" = ( @@ -3726,40 +4380,54 @@ id = "Ranger_AI_Core_Ext_Blasts" }, /obj/machinery/light/dim/directional/south, -/turf/open/floor/circuit/green/airless, +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "Nn" = ( /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "Nu" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) -"Ny" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/head/beret/eng/hazard, -/obj/item/storage/backpack/satchel/eng, -/obj/item/storage/backpack/messenger/engi, -/obj/item/storage/backpack/industrial, -/obj/item/storage/backpack/duffelbag/engineering, -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 +"Nw" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 }, -/obj/item/clothing/under/rank/engineering/engineer/nt/lp, -/obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp, -/turf/open/floor/wood, -/area/ship/engineering) +/obj/effect/turf_decal/trimline/opaque/orange/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) +"Ny" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/engine/hull, +/area/ship/external) "NC" = ( +/obj/machinery/light/floor, /obj/machinery/camera/autoname{ dir = 6 }, -/obj/machinery/light/floor, /turf/open/floor/engine/hull, /area/ship/external) +"NH" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/janitor) "NM" = ( /turf/open/floor/plasteel/stairs{ dir = 4 @@ -3776,23 +4444,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "NS" = ( -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/closet/crate/medical{ - name = "anesthetics crate" - }, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_x = 3 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical{ - pixel_x = 3 +/obj/structure/railing/corner{ + dir = 1 }, /turf/open/floor/plasteel/white, /area/ship/medical) @@ -3803,25 +4459,38 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/crew/dorm/captain) "Om" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/medical/paramedic/skirt/lp, -/obj/item/clothing/under/rank/medical/paramedic/lp, -/obj/item/clothing/suit/hooded/wintercoat/medical, -/obj/item/clothing/head/beret/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/storage/backpack/duffelbag/med, -/turf/open/floor/wood, +/obj/structure/railing{ + dir = 8; + layer = 4.1 + }, +/obj/effect/turf_decal/siding/blue, +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "On" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/sprayweb, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/red/full, +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/sign/poster/official/enlist{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "Ou" = ( /obj/structure/cable{ icon_state = "4-9" @@ -3830,10 +4499,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{ +/obj/effect/turf_decal/trimline/opaque/red/filled/line{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Ov" = ( /obj/machinery/light/dim/directional/east, @@ -3841,18 +4510,20 @@ autolinkers = list("broadcasterB","hub"); network = "nt_commnet" }, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" +/obj/effect/turf_decal/techfloor{ + dir = 8 }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "Ox" = ( -/obj/effect/turf_decal/corner/opaque/ntblue/half{ +/obj/structure/closet/firecloset/wall/directional/west, +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/orange/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "OC" = ( /obj/machinery/power/apc/auto_name/directional/north, @@ -3868,7 +4539,7 @@ /obj/structure/cable{ icon_state = "0-6" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "OK" = ( /obj/machinery/light_switch{ @@ -3879,15 +4550,8 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/obj/machinery/button/door{ - dir = 8; - pixel_x = 20; - name = "Cargo Bay Shutters"; - id = "Ranger_Cargo_Door"; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/red/filled/corner, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "OP" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half{ @@ -3896,7 +4560,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Pd" = ( /obj/structure/table/reinforced, @@ -3912,26 +4576,39 @@ pixel_x = 4; pixel_y = -2 }, -/obj/item/aiModule/zeroth{ - pixel_x = -5; - pixel_y = -6 - }, /obj/machinery/light/dim/directional/north, -/turf/open/floor/circuit/green/airless, +/obj/effect/turf_decal/techfloor, +/obj/item/aiModule/core/full/nanotrasen{ + pixel_x = -3; + pixel_y = -2 + }, +/turf/open/floor/circuit, /area/ship/engineering/communications) "Ph" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/table/wood, +/obj/item/stamp/cmo{ + pixel_x = -8; + pixel_y = 13 }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) +/obj/item/flashlight/lamp/green{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/toy/plush/moth/snow{ + pixel_x = 0; + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/ship/medical) +"Pk" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security/armory) "Po" = ( -/obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/siding/yellow{ dir = 8 }, +/obj/structure/ore_box, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Pr" = ( @@ -3942,7 +4619,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "PG" = ( /obj/structure/cable{ @@ -3955,72 +4632,81 @@ dir = 4 }, /obj/machinery/light/floor, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"PJ" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 + }, +/obj/item/gps/computer{ + pixel_x = 32; + pixel_y = 0; + density = 0 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "PR" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "PV" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/electrical{ - pixel_x = 3; - pixel_y = 7 - }, /obj/effect/turf_decal/techfloor{ dir = 8 }, +/obj/machinery/telecomms/message_server/preset{ + autolinkers = list("messaging","hub"); + network = "nt_commnet"; + layer = 3.1 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "Qf" = ( -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/corner/opaque/brown/full, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/cargo) "Qt" = ( -/obj/item/bodypart/leg/right/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/leg/left/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/bodypart/chest/robot, -/obj/item/bodypart/head/robot, -/obj/item/borg/upgrade/ai, -/obj/item/robot_suit, -/obj/structure/closet/crate/engineering, /obj/effect/turf_decal/industrial/hatch/orange, -/obj/item/stock_parts/cell/high, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/engineering) "Qu" = ( /obj/machinery/door/firedoor/window, /obj/structure/grille, /obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen, /turf/open/floor/plating, /area/ship/medical) "QT" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/starboard) "QV" = ( /obj/machinery/light/dim/directional/west, /turf/open/floor/engine/hull, /area/ship/external) "Rn" = ( -/obj/machinery/portable_atmospherics/pump, /obj/machinery/light/dim/directional/north, +/obj/effect/turf_decal/trimline/opaque/brown/warning{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/toy/plush/celadon/hampter/ert_squad, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "Ro" = ( /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line{ dir = 1 }, /obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "RA" = ( /obj/structure/closet/firecloset/wall/directional/south, @@ -4034,7 +4720,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "RB" = ( /obj/effect/turf_decal/trimline/opaque/orange/arrow_ccw{ @@ -4044,11 +4730,11 @@ dir = 8 }, /obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/port) "RM" = ( -/obj/structure/chair/sofa/brown/left/directional/west, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/blue/left/directional/west, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "RS" = ( /obj/machinery/portable_atmospherics/canister/toxins, @@ -4064,119 +4750,77 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Sl" = ( /obj/machinery/light/dim/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/rack, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/stack/cable_coil/cyan{ - pixel_x = 6 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, +/obj/item/storage/box/stockparts/basic, /turf/open/floor/plating, /area/ship/engineering) "So" = ( -/obj/structure/cable{ - icon_state = "5-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"SC" = ( -/obj/structure/table/wood, -/obj/item/storage/box/donkpockets{ - pixel_x = -3 +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/storage/box/donkpockets/donkpocketpizza{ - pixel_x = 2; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/storage/box/donkpockets/donkpocketspicy{ - pixel_y = 9; - pixel_x = 7 +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ + dir = 1 }, /turf/open/floor/plasteel/dark, +/area/ship/security/armory) +"SC" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/burger/bigbite, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "SE" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/industrial/outline/orange, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security) "SN" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{ - dir = 4 +/obj/effect/turf_decal/trimline/opaque/red/filled/line{ + dir = 4; + layer = 2.032 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "SU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/ship/hallway/central) +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) "Tb" = ( -/turf/closed/wall/r_wall, -/area/ship/storage) +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/opaque/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/brown/warning, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Tc" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/medical) +"Td" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "Te" = ( /obj/machinery/light/floor, /turf/open/floor/engine/hull, @@ -4196,20 +4840,30 @@ /turf/open/floor/engine/hull, /area/ship/external) "Tz" = ( -/turf/closed/wall/r_wall, +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) "TL" = ( -/obj/structure/closet/crate, -/obj/machinery/light/dim/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/machinery/suit_storage_unit/inherit, +/obj/machinery/door/window/brigdoor, +/obj/structure/window/reinforced/spawner{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/orange/half{ + dir = 1 + }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/suit/space/hardsuit/ert/lp/engi, +/obj/item/clothing/mask/gas/atmos, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "TR" = ( /obj/structure/table/wood, /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "TZ" = ( /obj/effect/turf_decal/trimline/opaque/orange/arrow_ccw{ @@ -4218,34 +4872,37 @@ /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/port) "Ua" = ( /obj/machinery/camera/autoname{ dir = 9 }, -/turf/open/floor/circuit/green/airless, -/area/ship/engineering/communications) -"Uj" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/paper_bin{ - pixel_y = 8; - pixel_x = 5 - }, -/obj/item/pen/fountain{ - pixel_x = -4; - pixel_y = 7 +/obj/machinery/button/door{ + dir = 8; + pixel_x = 26; + id = "AiCore"; + name = "Core Access"; + req_access_txt = "20"; + pixel_y = 8 }, -/obj/machinery/recharger{ - pixel_x = -4 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 5 }, -/obj/item/stamp/captain{ - pixel_x = 7 +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning{ + dir = 4 }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) +"Uj" = ( /obj/machinery/newscaster/directional/north, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 5 + }, +/obj/structure/table/reinforced/titaniumglass, +/obj/item/toy/plush/moth/royal, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "Ur" = ( /obj/structure/cable{ @@ -4260,23 +4917,42 @@ /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/port) "Us" = ( /obj/effect/turf_decal/siding/red{ dir = 9 }, -/obj/machinery/door_timer{ - pixel_y = 28; - id = "ranger_brig" +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = 23 }, +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/opaque/vired, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "Ut" = ( -/obj/structure/urinal{ - pixel_y = 29 +/obj/structure/mirror{ + pixel_x = 24 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = 13; + pixel_y = 2 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, -/obj/machinery/light/dim/directional/west, /turf/open/floor/plastic, /area/ship/crew/toilet) "UQ" = ( @@ -4294,13 +4970,13 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "UW" = ( /obj/structure/cable/cyan{ icon_state = "6-9" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/ship/maintenance/port) "Vg" = ( @@ -4327,21 +5003,22 @@ dir = 1 }, /obj/effect/turf_decal/trimline/opaque/red/filled/line, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Vk" = ( -/obj/structure/bed, -/obj/item/bedsheet/nanotrasen, -/obj/machinery/firealarm/directional/north, -/obj/item/toy/plush/moth/royal{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, +/obj/structure/closet/cabinet, +/obj/item/clothing/under/rank/medical/paramedic/skirt/lp, +/obj/item/clothing/under/rank/medical/paramedic/lp, +/obj/item/clothing/suit/hooded/wintercoat/medical, +/obj/item/clothing/head/beret/med, +/obj/item/storage/backpack/satchel/med, +/obj/item/storage/backpack/messenger/med, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/ert/medical, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/wood, -/area/ship/crew/dorm) +/area/ship/medical) "Vm" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -4349,7 +5026,7 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "Vp" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/starboard) "Vq" = ( /obj/machinery/portable_atmospherics/canister/toxins, @@ -4358,21 +5035,26 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "Vt" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/cryo) +"Vy" = ( +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ship/maintenance/port) +/obj/effect/turf_decal/trimline/opaque/vired/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "VC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/stairs, /area/ship/crew/cryo) "VJ" = ( -/obj/machinery/door/airlock/engineering{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -4382,13 +5064,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/trimline/opaque/ntblue/warning{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/turf_decal/trimline/opaque/orange/warning{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "VM" = ( /obj/effect/turf_decal/industrial/outline/blue, @@ -4403,11 +5085,23 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "VP" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/closet/cabinet, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/hooded/wintercoat/security, +/obj/item/clothing/head/beret/sec, +/obj/item/clothing/under/rank/security/head_of_security/nt/lp, +/obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp, +/obj/item/clothing/suit/armor/vest/security/officer, +/obj/item/clothing/under/rank/security/head_of_security/alt/lp, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/under/rank/security/officer/blueshirt, +/obj/item/storage/backpack/ert/security, +/obj/item/reagent_containers/food/drinks/beer, +/obj/structure/railing{ + dir = 8; + layer = 4.1 }, -/obj/structure/closet, -/turf/open/floor/plasteel/dark, +/turf/open/floor/wood, /area/ship/security) "VQ" = ( /obj/machinery/camera/autoname{ @@ -4417,9 +5111,9 @@ /area/ship/external) "Wj" = ( /obj/structure/bed, -/obj/item/radio/intercom/directional/south, -/obj/item/bedsheet/red, -/turf/open/floor/wood, +/obj/item/bedsheet/nanotrasen, +/obj/structure/curtain/cloth, +/turf/open/floor/carpet/executive, /area/ship/security) "Wp" = ( /obj/machinery/door/poddoor{ @@ -4449,10 +5143,9 @@ /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Wv" = ( -/obj/structure/chair/sofa/brown/right/directional/south, /obj/item/toy/plush/goatplushie{ layer = 3.1 }, @@ -4460,11 +5153,15 @@ pixel_x = -7; pixel_y = 21 }, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/blue/right/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "WF" = ( /obj/item/radio/intercom/wideband, -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "WG" = ( /obj/machinery/telecomms/server/presets/nanotrasen{ @@ -4473,20 +5170,15 @@ freq_listening = list(1353,1447,1459) }, /obj/item/disk/holodisk/lp/stations, -/turf/open/floor/circuit/telecomms{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ship/engineering/communications) -"WR" = ( -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/techfloor{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) +/turf/open/floor/circuit, +/area/ship/engineering/communications) "WZ" = ( /obj/machinery/computer/telecomms/server{ - dir = 4 + dir = 4; + icon_state = "computer-right" }, /obj/machinery/light/dim/directional/west, /turf/open/floor/plasteel/mono/dark, @@ -4498,11 +5190,16 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Xt" = ( -/obj/machinery/space_heater, /obj/machinery/light/dim/directional/south, -/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/opaque/brown/warning, +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/glass/five, +/obj/effect/turf_decal/trimline/opaque/brown/line{ + dir = 1 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "XA" = ( /obj/structure/cable{ icon_state = "1-10" @@ -4520,7 +5217,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "XH" = ( /obj/machinery/power/apc/auto_name/directional/east, @@ -4528,6 +5225,10 @@ icon_state = "0-8" }, /obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "XL" = ( @@ -4542,7 +5243,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "XQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -4554,22 +5255,8 @@ /obj/effect/turf_decal/trimline/opaque/blue/filled/corner{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) -"XR" = ( -/obj/machinery/door/airlock/public/glass, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) "XS" = ( /obj/effect/turf_decal/corner/opaque/blue/diagonal, /obj/structure/table/greyscale, @@ -4578,24 +5265,20 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "XT" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo) "XV" = ( /obj/machinery/camera/autoname{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/grey/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) -"Yk" = ( -/obj/effect/decal/cleanable/glass, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) "Yw" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4607,7 +5290,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Yy" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ @@ -4627,7 +5310,6 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "Yz" = ( -/obj/structure/window/reinforced, /obj/effect/turf_decal/siding/red{ dir = 6 }, @@ -4637,28 +5319,20 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) -"YJ" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ancient/lp, -/obj/item/clothing/mask/breath, -/obj/effect/turf_decal/corner/opaque/brown/mono, -/obj/item/tank/internals/emergency_oxygen, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/dark, -/area/ship/storage) "YK" = ( /obj/machinery/light_switch{ pixel_x = 8; pixel_y = 22 }, +/obj/machinery/button/door{ + pixel_x = -1; + pixel_y = 23 + }, /turf/open/floor/plasteel/stairs/wood{ - dir = 8 + dir = 4 }, /area/ship/medical) "YP" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/structure/cable/cyan{ icon_state = "4-10" }, @@ -4669,7 +5343,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 4 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -4685,7 +5359,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Zj" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ @@ -4710,10 +5384,10 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Zl" = ( -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/industrial/outline/orange, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/obj/effect/decal/cleanable/plasma, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/security) "Zs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -4725,17 +5399,21 @@ /obj/structure/cable{ icon_state = "1-6" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Zv" = ( -/obj/machinery/firealarm/directional/west, -/turf/open/floor/wood, +/obj/effect/turf_decal/spline/plain/opaque/ntblue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "Zw" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/ntblue/filled/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Zx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4743,7 +5421,7 @@ /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "ZF" = ( /obj/machinery/light/dim/directional/south, @@ -4755,40 +5433,52 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/trimline/opaque/grey/filled/corner, +/turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "ZJ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/turf/open/floor/plasteel/tech/airless, +/turf/open/floor/plasteel/tech, /area/ship/engineering/communications) "ZL" = ( -/obj/machinery/vending/coffee, /obj/machinery/light/dim/directional/east, -/turf/open/floor/plasteel/dark, +/obj/structure/table/wood, +/obj/item/melee/knife/kitchen, +/obj/item/cutting_board, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "ZS" = ( -/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/trimline/opaque/brown/warning{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/effect/spawner/lootdrop/ration{ + pixel_x = -10; + pixel_y = 0 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage) +/area/ship/cargo) "ZW" = ( /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel/dark, /area/ship/hallway/port) "ZY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) (1,1,1) = {" @@ -4907,14 +5597,14 @@ zW zW zW zW -LV +fD LV qS Tg dM Ib HZ -LV +kV zW zW zW @@ -4928,14 +5618,14 @@ zW zW zW zW -QT +nu Vm tZ oq an cE QT -QT +yQ zW zW "} @@ -4945,7 +5635,7 @@ zW zW zW LV -Zl +eP Vq aW UW @@ -4981,11 +5671,11 @@ zW zW zW zW -vm -Vq -Zl iq -Vt +iq +iq +iq +iq xB AT LV @@ -5006,10 +5696,10 @@ QT VM YP vv -Ph -RS +vv +Zl SE -fV +vv zW zW "} @@ -5017,49 +5707,49 @@ zW zW zW zW +iq +iq vm -vm -vm -vm -vm -LV +Vk +Ph +iq ad ZF LV zW zW zW -Kg +fD Kg gh Md pL Kg -Kg +yQ zW zW zW QT ML ih -QT -QT -QT -fV -fV +vv +bE +tO fV +vv +vv zW "} (8,1,1) = {" zW zW -zW -vm +hN +iq xp -Aw +oQ oQ tq -LV +iq sm qb LV @@ -5068,9 +5758,9 @@ zW zW Kg Pd -vO +PJ IE -vO +zB Nf Kg zW @@ -5079,30 +5769,30 @@ zW QT gz FQ -QT +vv jv Zv AZ Wj -fV -zW +vv +cT "} (9,1,1) = {" zW zW -vm -vm +Tc +iq YK aO Om -Gn -LV +iq +iq vT LV LV zW zW -wq +fL Kg MK Ua @@ -5110,61 +5800,61 @@ vO Nn Cq Kg -wq +fL zW zW QT QT id -QT -fV -bw +vv +vv +ab hQ ab -fV -fV +vv +CT "} (10,1,1) = {" zW zW -vm +iq sF oi NS vF -vm -jA +iq +SU zc jA zW zW -Tz +wU Tz Kg Kg Kg kw gk -zB Kg Kg +Gn Kg zW zW Vp cN vR -fV +vv Us Js Ma sR -fV +vv "} (11,1,1) = {" zW zW -vm +iq ix Kt jk @@ -5173,35 +5863,35 @@ Qu Cb NR jA -zW -Tz -Tz +Ny +wU +wU jt WZ Mh -Tz +wU nE fU -kt +Kg LM bX Kg Kg -zW +Ny Vp Ff wT -fV +vv gi Lg bN VP -fV +vv "} (12,1,1) = {" zW zW -vm +iq vV GC kS @@ -5211,9 +5901,9 @@ XQ PR jA zW -Tz +wU LQ -MD +aP aP xq Wp @@ -5231,14 +5921,14 @@ Vh qR tQ nh +kj Dx -Dx -fV +vv "} (13,1,1) = {" zW zW -vm +iq GE vh lL @@ -5248,16 +5938,16 @@ cR pU jA zW -Tz +wU gN dr rC yi Dr ZJ -fU +wf Mx -tT +Td tT ux Kg @@ -5265,17 +5955,17 @@ zW Vp TR KX -fV +vv Ji Yz hf iH -fV +vv "} (14,1,1) = {" zW zW -vm +iq XS Xb sU @@ -5285,45 +5975,45 @@ bf tR jA zW -Tz +wU Ge or JP -Tz -Tz +wU +wU hK Hd -Tz +wU Ds Bo WG -Kg -zW -Vp -bD -iD -fV -fV -fV -fV -fV -fV +Kg +zW +Vp +bD +iD +vv +vv +vv +vv +vv +vv "} (15,1,1) = {" zW zW -JR -JR -JR -JR -JR +Vt +Vt +Vt +Vt +Vt jA jH uE jA zW -Tz -Tz +wU +wU Sl Nd IC @@ -5340,7 +6030,7 @@ Vp yo Cg of -gg +am Ut BI xv @@ -5349,26 +6039,26 @@ gg (16,1,1) = {" zW zW -JR +Vt js kh -JR -JR +Vt +Vt dd er Kf jA zW zW -Tz -Tz +wU +wU Qt -Tz +wU Ca rA yU -dP -wf +wU +Kg Kg Kg zW @@ -5378,7 +6068,7 @@ pi iZ ji gg -am +gg gg gg gg @@ -5386,7 +6076,7 @@ gg (17,1,1) = {" zW zW -JR +Vt Iy ym VC @@ -5397,33 +6087,33 @@ jA jA zW zW -zW -Tz -Tz -Tz +eM +wU +wU +wU up hn aG -Tz +xf Kg Kg -zW +AE zW zW Vp Vp MI zF -gg +NH my fo BA -gg +NH "} (18,1,1) = {" zW zW -JR +Vt vB cW lc @@ -5436,13 +6126,13 @@ zW zW zW zW -Tz +wU jr Mt lX -Ny +Bh JK -Tz +wU zW zW zW @@ -5451,16 +6141,16 @@ zW Vp dK ZI -gg +NH qe oM yK -gg +NH "} (19,1,1) = {" zW zW -JR +Vt tb mQ rq @@ -5473,13 +6163,13 @@ zW zW zW zW -Tz +wU ps Hs tk -Bh +Ju GY -Tz +wU zW zW zW @@ -5492,16 +6182,16 @@ Fw Kw Lt yC -gg +NH "} (20,1,1) = {" zW zW -JR +Vt IQ XH -JR -JR +Vt +Vt ZW cx jA @@ -5509,15 +6199,15 @@ jA zW zW zW -Tz -Tz +wU +wU eo FB wU hZ Lw -Tz -Tz +wU +wU zW zW zW @@ -5525,19 +6215,19 @@ Vp Vp OC XV -gg +NH vk pp Mc -gg +NH "} (21,1,1) = {" zW zW -JR -JR -JR -JR +ES +Vt +Vt +Vt jA wE hJ @@ -5547,13 +6237,13 @@ sJ sJ sJ sJ -sJ -sJ +Kl +bR VJ -sJ -sJ -sJ -sJ +Nw +Ox +cF +kt sJ sJ sJ @@ -5563,10 +6253,10 @@ aD Pr eT Vp -gg -gg -gg -gg +NH +NH +NH +th "} (22,1,1) = {" zW @@ -5587,10 +6277,10 @@ mw rX vj fd -Ox +BX BX Gk -Kl +BX mw zi lj @@ -5602,7 +6292,7 @@ Mm uk xA Vp -QV +iV zW "} (23,1,1) = {" @@ -5619,7 +6309,7 @@ kO UU PG Gh -XR +bw OP OP OP @@ -5629,7 +6319,7 @@ OP GG XE OP -XR +bw mh az XL @@ -5639,7 +6329,7 @@ Zw rM Mg wh -wq +Gf zW "} (24,1,1) = {" @@ -5660,11 +6350,11 @@ sJ Wv Fx fy -bu +Eh pn Av tf -bu +bt rT sJ Vg @@ -5699,20 +6389,20 @@ IM RM Mn bu -bu +aR AP -bu +AU kK sJ Zk us sJ -XT +hp zC fz -XT -XT -XT +hp +hp +hp hz zW "} @@ -5721,18 +6411,18 @@ ef zW zW zW -Tb -Tb -Tb +XT +XT +XT dl aI -Tb -Tb +XT +XT UQ rZ -Mf -Mf -Mf +jC +jC +Kc sJ EP ZL @@ -5748,8 +6438,8 @@ DZ So Eq lU -cj -XT +gL +hp zW zW "} @@ -5758,16 +6448,16 @@ zW zW zW zW -Tb +XT Rn mJ KC jZ Be -Tb +XT sJ -SU -Mf +sJ +jC Gc Ha Lk @@ -5776,17 +6466,17 @@ Lk Lk tj Lk -sJ +Lk sJ Tl CP -XT +hp Iz -lv -pD +Vy +ar ww vz -XT +hp zW zW "} @@ -5795,16 +6485,16 @@ zW zW zW zW -Tb +XT ZS rg qZ wu yZ -Tb +XT NC jC -Mf +Aw mv Ao JO @@ -5812,18 +6502,18 @@ pA lD hF ec +tw Lk Te -wq zW zW -XT +hp lw -pD -Yk +JL +aM +FI +et hp -gL -XT zW zW "} @@ -5832,35 +6522,35 @@ zW zW zW zW -Tb -Tb +uD +XT aK -WR Qf +sY Xt -Tb -zW +XT zW +jC Mf -Vk +mv NZ Lk sf iF XA Sa +Kq Lk wq zW zW -zW -XT +hp TL -pD +Ay pD eE -XT -XT +hp +xL zW zW "} @@ -5870,15 +6560,15 @@ zW zW zW zW -Tb -Tb +XT +XT DE -YJ +sY Tb -Tb -zW +XT zW -Mf +jC +jC Mu hx Lk @@ -5886,17 +6576,17 @@ AF vp CI dC +hY Lk zW zW zW -zW -XT -XT +hp eU +lv On -XT -XT +hp +hp zW zW zW @@ -5908,15 +6598,15 @@ zW zW zW zW -Tb -Tb -Tb -Tb -zW +XT +XT +XT +XT +XT zW zW -Mf -Mf +jC +jC Fg Lk tK @@ -5924,15 +6614,15 @@ og NM ff Lk +Lk zW zW zW -zW -zW -XT -XT -XT -XT +hp +hp +hp +hp +hp zW zW zW @@ -5949,12 +6639,12 @@ zW zW zW zW +fl zW zW zW -zW -Mf -Mf +jC +jC Lk Ek jj @@ -5965,7 +6655,7 @@ zW zW zW zW -zW +Pk zW zW zW @@ -5986,11 +6676,11 @@ zW zW zW zW +wq zW zW zW -zW -wq +VQ wq Lk mn @@ -6002,7 +6692,7 @@ zW zW zW zW -zW +wq zW zW zW @@ -6023,7 +6713,7 @@ zW zW zW zW -zW +Te zW zW zW @@ -6039,7 +6729,7 @@ zW zW zW zW -zW +Te zW zW zW @@ -6064,7 +6754,7 @@ zW zW zW zW -wq +zt zW Lk LU diff --git a/mod_celadon/items/_items.dme b/mod_celadon/items/_items.dme index 82a95873f435..48327badf3b9 100644 --- a/mod_celadon/items/_items.dme +++ b/mod_celadon/items/_items.dme @@ -30,5 +30,6 @@ #include "code/ammunition.dm" #include "code/box_magazine.dm" #include "code/shufflers.dm" +#include "code/spacesuits.dm" #endif diff --git a/mod_celadon/items/code/spacesuits.dm b/mod_celadon/items/code/spacesuits.dm new file mode 100644 index 000000000000..720b1ad7dbd5 --- /dev/null +++ b/mod_celadon/items/code/spacesuits.dm @@ -0,0 +1,22 @@ +//******************** +// Spacesuits +//******************** +/obj/item/clothing/suit/space/hardsuit/ert/lp/jani + name = "Loss Prevention Janitorial Hardsuit" + desc = "The best of the best janitorial staff get assigned to the ERT. Second best are given this Hardsuit as a part of the LP Team." + armor = list("melee" = 50, "bullet" = 25, "laser" = 20, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp/jani + resistance_flags = null + max_heat_protection_temperature = null + icon_state = "ert_janitor" + item_state = "ert_janitor" + +/obj/item/clothing/head/helmet/space/hardsuit/ert/lp/jani + armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 80) + name = "Loss Prevention Janitorial Hardsuit Helmet" + desc = "The helmet that comes attached to the LP Team Janitorial Hardsuit." + resistance_flags = null + max_heat_protection_temperature = null + icon_state = "hardsuit0-ert_janitor" + item_state = "hardsuit0-ert_janitor" + hardsuit_type = "ert_janitor" diff --git a/mod_celadon/outfit/_outfit.dme b/mod_celadon/outfit/_outfit.dme index 115b4ac541de..c84ffa1216a0 100644 --- a/mod_celadon/outfit/_outfit.dme +++ b/mod_celadon/outfit/_outfit.dme @@ -21,6 +21,7 @@ #include "code/inteq/cards_ids.dm" #include "code/inteq/inteq_outfit.dm" +#include "code/nanotrasen/nt_card_id.dm" #include "code/nanotrasen/nt_outfit.dm" #include "code/solfed/solfed_card_id.dm" diff --git a/mod_celadon/outfit/code/nanotrasen/nt_card_id.dm b/mod_celadon/outfit/code/nanotrasen/nt_card_id.dm new file mode 100644 index 000000000000..37bc016d0a0c --- /dev/null +++ b/mod_celadon/outfit/code/nanotrasen/nt_card_id.dm @@ -0,0 +1,4 @@ +/obj/item/card/id/lpjanitor + icon_state = "ert_janitor" + desc = "The LP Janitor Specialist's ID card." + name = "LP Janitor Specialist" diff --git a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm index dc4c239956cb..ea77c4b5a586 100644 --- a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm +++ b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm @@ -44,3 +44,20 @@ courierbag = /obj/item/storage/backpack/messenger/tox chameleon_extras = /obj/item/stamp/rd + +//лп уборщик + +/datum/outfit/job/nanotrasen/janitor/lp + name = "Nanotrasen - LP Janitorial Specialist" + jobtype = /datum/job/janitor + job_icon = "janitor" + + uniform = /obj/item/clothing/under/nanotrasen/janitor + shoes = /obj/item/clothing/shoes/sneakers/black + suit = /obj/item/clothing/suit/nanotrasen/suitjacket + head = /obj/item/clothing/head/nanotrasen/cap/janitor + id = /obj/item/card/id/lpjanitor + ears = /obj/item/radio/headset/nanotrasen + belt = /obj/item/storage/belt/janitor + gloves = /obj/item/clothing/gloves/color/purple + back = /obj/item/storage/backpack/ert/janitor From 8a453bced04a4c56c0cd80bad0889bbe298f5e48 Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Fri, 22 Nov 2024 23:24:59 +0300 Subject: [PATCH 03/11] Fix saving tajara and riol hairs (#1209) --- code/modules/client/preferences_savefile.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index be1c4edf4721..72c518a31c5a 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -556,16 +556,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(species_id == "tajara") hairstyle = sanitize_inlist(hairstyle, GLOB.tajara_hairs_list) facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.tajara_facial_hairs_list) - features["grad_style"] = sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list) - features["grad_color"] = sanitize_hexcolor(features["grad_color"]) - if(species_id == "riol") + else if(species_id == "riol") hairstyle = sanitize_inlist(hairstyle, GLOB.riol_hairs_list) facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.riol_facial_hairs_list) - features["grad_style"] = sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list) - features["grad_color"] = sanitize_hexcolor(features["grad_color"]) - - // [/CELADON-EDIT] else From 0599d38f03e145ed025a31d032d01c6022fdf72f Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Sat, 23 Nov 2024 03:25:18 +0700 Subject: [PATCH 04/11] Coils are now deconstructing correctly (#1206) --- mod_celadon/fixes/_fixes.dm | 4 ++-- mod_celadon/fixes/_fixes.dme | 1 + mod_celadon/fixes/code/coil.dm | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 mod_celadon/fixes/code/coil.dm diff --git a/mod_celadon/fixes/_fixes.dm b/mod_celadon/fixes/_fixes.dm index 918a601691f0..18bbdfab2975 100644 --- a/mod_celadon/fixes/_fixes.dm +++ b/mod_celadon/fixes/_fixes.dm @@ -1,7 +1,7 @@ /datum/modpack/fixes name = "Fixes" - desc = "Содержит различные фиксы багов. Фикс удушья при пустом баллоне. Сломанные иконки. Исправление работы плазма двигателей, фикс зарядки револьверов, фикс newscaster, фикс дюпа боргов, фикс сломанных шаттерсов, поддержка русского языка в конослях телекоммовб, добавляет возможность писать в LOOC будучи призраком. Чинит миссии на исследования карпов, метеоритов и пыли." // TODO сделать ПР для офовичные фиксы багов. Фикс удушья при пустом баллоне. Сломанные иконки. Исправление работы плазма двигателей,фикс зарядки револьверов, фикс дюпа боргов, фикс сломанных шаттерсов" // TODO сделать ПР для офов - author = "RalseiDreemuurr, Mirag1993, Корольный крыс, MrCat15352, MysticalFaceLesS, GrozaAndGrom, MrRomainzZ" + desc = "Содержит различные фиксы багов. Фикс удушья при пустом баллоне. Сломанные иконки. Исправление работы плазма двигателей, фикс зарядки револьверов, фикс newscaster, фикс дюпа боргов, фикс сломанных шаттерсов, поддержка русского языка в конослях телекоммовб, добавляет возможность писать в LOOC будучи призраком. Чинит миссии на исследования карпов, метеоритов и пыли, фикс разборки коилов" // TODO сделать ПР для офовичные фиксы багов. Фикс удушья при пустом баллоне. Сломанные иконки. Исправление работы плазма двигателей,фикс зарядки револьверов, фикс дюпа боргов, фикс сломанных шаттерсов" // TODO сделать ПР для офов + author = "RalseiDreemuurr, Mirag1993, Корольный крыс, MrCat15352, MysticalFaceLesS, GrozaAndGrom, MrRomainzZ, Yata9arasu" /// Эти проки нужны, для того чтобы инициализировать датумы в определенный момент времени /// сборки билда. Инициализация обновляет данные в билде повторно, перезаписывая новыми значениями diff --git a/mod_celadon/fixes/_fixes.dme b/mod_celadon/fixes/_fixes.dme index 1ff0540e329e..460c75e28141 100644 --- a/mod_celadon/fixes/_fixes.dme +++ b/mod_celadon/fixes/_fixes.dme @@ -14,5 +14,6 @@ #include "code/shutters.dm" #include "code/vending.dm" #include "code/turf.dm" +#include "code/coil.dm" #endif diff --git a/mod_celadon/fixes/code/coil.dm b/mod_celadon/fixes/code/coil.dm new file mode 100644 index 000000000000..81ae567d142a --- /dev/null +++ b/mod_celadon/fixes/code/coil.dm @@ -0,0 +1,11 @@ +/obj/machinery/power/grounding_rod + name = "grounding rod" + desc = "Keep an area from being fried from Edison's Bane." + icon = 'icons/obj/tesla_engine/tesla_coil.dmi' + icon_state = "grounding_rod0" + anchored = FALSE + density = TRUE + can_buckle = TRUE + buckle_lying = FALSE + buckle_requires_restraints = TRUE + circuit = /obj/item/circuitboard/machine/grounding_rod From 14654fb00a9c70251032d3fcb34045582049922a Mon Sep 17 00:00:00 2001 From: Redwizz777 Date: Fri, 22 Nov 2024 22:05:04 +0100 Subject: [PATCH 05/11] Pipes manifold layer fix (#1207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пофикшено визуальное дублирование перекрестка труб. --- .../machinery/pipes/heat_exchange/manifold.dm | 10 ++++++---- .../machinery/pipes/heat_exchange/manifold4w.dm | 10 ++++++---- code/modules/atmospherics/machinery/pipes/manifold.dm | 11 ++++++----- .../atmospherics/machinery/pipes/manifold4w.dm | 8 ++++---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm index d452f11c11e7..f02e1a4b75a6 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm @@ -26,16 +26,18 @@ initialize_directions = ALL_CARDINALS initialize_directions &= ~dir -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_overlays() - . = ..() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_icon() + cut_overlays() PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - . += center + add_overlay(center) //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) + add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) + + update_layer() /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2 piping_layer = 2 diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm index 40a049064148..18b4b1923f30 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm @@ -24,16 +24,18 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections() initialize_directions = initial(initialize_directions) -/obj/machinery/atmospherics/pipe/manifold4w/update_overlays() - . = ..() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_icon() + cut_overlays() PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - . += center + add_overlay(center) //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) + add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) + + update_layer() /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2 piping_layer = 2 diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index 106c7b8c7693..ab84d34bdb02 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -35,15 +35,16 @@ initialize_directions = ALL_CARDINALS initialize_directions &= ~dir -/obj/machinery/atmospherics/pipe/manifold/update_overlays() - . = ..() - +/obj/machinery/atmospherics/pipe/manifold/update_icon() + cut_overlays() if(!center) center = mutable_appearance(icon, "manifold_center") PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - . += center + add_overlay(center) //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) + add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) + + update_layer() diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index f52f0daa53b7..48e47d540580 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -29,16 +29,16 @@ /obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections() initialize_directions = initial(initialize_directions) -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_overlays() - . = ..() +/obj/machinery/atmospherics/pipe/manifold4w/update_icon() + cut_overlays() if(!center) center = mutable_appearance(icon, "manifold_center") PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - . += center + add_overlay(center) //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) + add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) update_layer() From bd853270181f82919fbdbadeb154ae769eaa592d Mon Sep 17 00:00:00 2001 From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com> Date: Tue, 26 Nov 2024 00:41:53 +0500 Subject: [PATCH 06/11] UPDATE: Fix Flower (#1214) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Flower Починил баги с ним, обновил интерьер по пожеланию автора карты * Уменьшаем грязь --- .../independent/independent_flower.dmm | 291 ++++++++++++++++-- 1 file changed, 261 insertions(+), 30 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/independent/independent_flower.dmm b/_maps/_mod_celadon/shuttles/independent/independent_flower.dmm index 178dd5af7f06..fd1b4f49847e 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_flower.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_flower.dmm @@ -35,6 +35,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "bq" = ( @@ -72,6 +74,9 @@ dir = 4; preferred_direction = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "da" = ( @@ -113,6 +118,12 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/ship/crew/hydroponics) +"et" = ( +/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/hydroponics) "ex" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -182,6 +193,7 @@ icon_state = "0-6" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/engineering) "gV" = ( @@ -199,8 +211,14 @@ /turf/open/floor/plating/rust, /area/ship/external) "hd" = ( -/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) @@ -231,6 +249,9 @@ }, /obj/structure/table/wood, /obj/machinery/smartfridge/disks, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "hK" = ( @@ -240,8 +261,23 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"hO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "flowerwindows" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/crew/hydroponics) "iq" = ( /obj/machinery/seed_extractor, +/obj/machinery/jukebox/boombox{ + pixel_y = 10; + pixel_x = -4; + layer = 3.22 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "iN" = ( @@ -256,6 +292,9 @@ /obj/machinery/hydroponics/constructable, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/corner/opaque/bottlegreen/half, +/obj/effect/decal/cleanable/vomit/old{ + pixel_y = -10 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "jG" = ( @@ -297,7 +336,10 @@ }, /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/hangar/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/white, /area/ship/crew/hydroponics) "lJ" = ( /obj/machinery/light/directional/east, @@ -308,6 +350,9 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "mc" = ( @@ -315,6 +360,7 @@ dir = 8 }, /obj/effect/turf_decal/corner/opaque/brown/border, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) "nu" = ( @@ -374,7 +420,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, +/obj/item/trash/energybar, /turf/open/floor/plating, /area/ship/engineering) "qc" = ( @@ -387,6 +433,8 @@ /area/ship/external) "qS" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/crew/hydroponics) "rb" = ( @@ -400,6 +448,7 @@ /obj/effect/turf_decal/corner/opaque/bottlegreen/half{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "rw" = ( @@ -450,6 +499,11 @@ id = "flowerwindows"; dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/bridge) "ss" = ( @@ -468,6 +522,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/engineering) "sQ" = ( @@ -500,6 +555,15 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) +"uu" = ( +/obj/machinery/door/poddoor/shutters{ + id = "flowerwindows" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/crew/hydroponics) "uA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -541,6 +605,7 @@ /obj/effect/turf_decal/corner/opaque/brown/border{ dir = 5 }, +/obj/item/trash/cheesie, /turf/open/floor/plasteel/dark, /area/ship/cargo) "uZ" = ( @@ -599,6 +664,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "wX" = ( @@ -644,6 +710,11 @@ id = "flowerwindows"; dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/bridge) "yG" = ( @@ -655,11 +726,8 @@ pixel_x = 0; pixel_y = -17 }, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ - dir = 8 - }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/corner/opaque/blue/full, /turf/open/floor/plasteel/dark, /area/ship/bridge) "zn" = ( @@ -670,6 +738,10 @@ dir = 4 }, /obj/effect/turf_decal/corner/opaque/brown/border, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/dark, /area/ship/cargo) "AB" = ( @@ -683,6 +755,7 @@ dir = 4 }, /obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "AF" = ( @@ -693,6 +766,9 @@ /obj/machinery/door/poddoor{ id = "flowerengines" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "AX" = ( @@ -703,6 +779,7 @@ icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ship/engineering) "Cf" = ( @@ -754,13 +831,29 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) +"EL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/bottlegreen/half{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/hydroponics) "EV" = ( /obj/machinery/vending/hydroseeds{ all_items_free = 1 }, /obj/effect/turf_decal/corner/opaque/bottlegreen/half, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "Fc" = ( @@ -776,6 +869,7 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 9 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Fi" = ( @@ -794,7 +888,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/engineering) "FK" = ( @@ -811,6 +904,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/corner/opaque/brown/border, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) "FQ" = ( @@ -820,6 +914,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/dark, /area/ship/cargo) "FZ" = ( @@ -830,6 +926,18 @@ dir = 1 }, /obj/structure/flora/ausbushes/ywflowers, +/mob/living/simple_animal/hostile/netherworld/migo{ + environment_smash = 0; + faction = list("neutral"); + melee_damage_lower = 5; + melee_damage_upper = 10; + icon = 'icons/mob/pets.dmi'; + icon_dead = "mothroach_dead"; + icon_living = "mothroach"; + icon_state = "mothroach"; + desc = "This is the adorable by-product of multiple attempts at genetically mixing mothpeople with cockroaches. It is so pretty moth."; + name = "mothi" + }, /turf/open/floor/grass, /area/ship/crew/hydroponics) "Gt" = ( @@ -854,6 +962,9 @@ /obj/effect/turf_decal/corner/opaque/brown/border{ dir = 10 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) "Ih" = ( @@ -861,18 +972,18 @@ /obj/structure/curtain/bounty, /obj/item/bedsheet/random, /obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters, /obj/machinery/light/directional/west, /obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/corner/opaque/blue/full, /turf/open/floor/plasteel/dark, /area/ship/bridge) "IL" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light/directional/south, /obj/effect/turf_decal/corner/opaque/bottlegreen/half, +/obj/effect/decal/cleanable/vomit/old{ + pixel_y = -10 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "Jb" = ( @@ -905,8 +1016,18 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) +"Ks" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "flowerwindows" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/crew/hydroponics) "Ku" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -987,9 +1108,16 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"Mm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/cargo) "Mu" = ( /obj/machinery/biogenerator, /obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "MF" = ( @@ -1009,6 +1137,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/rust, /area/ship/engineering) "Nm" = ( @@ -1041,6 +1170,9 @@ /area/ship/crew/hydroponics) "Nv" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/cargo) "Op" = ( @@ -1053,11 +1185,18 @@ /obj/effect/turf_decal/corner/opaque/bottlegreen/half{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "OF" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/corner/opaque/bottlegreen/half, +/obj/effect/decal/cleanable/vomit/old{ + pixel_y = -10 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "ON" = ( @@ -1145,6 +1284,8 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) "Qo" = ( @@ -1155,6 +1296,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "Qv" = ( @@ -1165,6 +1310,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/ship/engineering) "Qy" = ( @@ -1181,6 +1328,10 @@ /obj/machinery/door/poddoor/shutters{ id = "flowerwindows" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/crew/hydroponics) "Rk" = ( @@ -1188,6 +1339,9 @@ id = "flowerengines" }, /obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "Rw" = ( @@ -1200,6 +1354,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) "RC" = ( @@ -1209,8 +1364,43 @@ /obj/machinery/computer/cargo{ dir = 8 }, +/obj/item/trash/plate{ + pixel_y = 6; + pixel_x = 1 + }, +/obj/item/trash/plate{ + pixel_y = 8; + pixel_x = 6 + }, +/obj/item/trash/plate{ + pixel_y = 11; + pixel_x = 5 + }, +/obj/item/trash/plate{ + pixel_y = 13; + pixel_x = 7 + }, +/obj/item/trash/can{ + pixel_y = 17; + pixel_x = 7 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"RO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark, +/area/ship/crew/hydroponics) "So" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -1228,6 +1418,10 @@ /obj/machinery/door/poddoor{ id = "flowerengines" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering) "Sy" = ( @@ -1287,6 +1481,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/engineering) "UO" = ( @@ -1309,6 +1504,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) "VD" = ( @@ -1322,7 +1518,10 @@ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/hangar/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/white, /area/ship/crew/hydroponics) "Wo" = ( /obj/item/clothing/suit/hazardvest{ @@ -1352,6 +1551,7 @@ dir = 9 }, /obj/item/pickaxe/improvised, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ship/cargo) "WF" = ( @@ -1383,6 +1583,7 @@ pixel_x = -1; pixel_y = -8 }, +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/dark, /area/ship/bridge) "WT" = ( @@ -1405,11 +1606,33 @@ /obj/effect/turf_decal/solarpanel, /turf/open/floor/plating, /area/ship/external) +"XE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/item/trash/raisins{ + pixel_x = -4; + pixel_y = 2 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/hydroponics) "Ze" = ( /obj/machinery/door/poddoor/shutters{ id = "flowerwindows" }, /obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/crew/hydroponics) "ZA" = ( @@ -1434,6 +1657,12 @@ }, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"ZJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/crew/hydroponics) "ZX" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets/donkpocketberry{ @@ -1445,6 +1674,8 @@ }, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/corner/opaque/blue/three_quarters, +/obj/effect/decal/cleanable/vomit/old, +/obj/item/trash/plate, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -1557,8 +1788,8 @@ AF CK Wo HI -Nv -Rw +Mm +XE xc lz VD @@ -1608,12 +1839,12 @@ AF Nm FQ mc -Nv -Rw +Mm +hd qS Op OF -Ze +uu AF AF AF @@ -1625,10 +1856,10 @@ AF CK uU iN -Nv +Mm Rw -qS -Op +ZJ +EL iZ xc AF @@ -1664,7 +1895,7 @@ dj qS ue OF -QD +Ks AF AF AF @@ -1673,13 +1904,13 @@ AF AF AF AF -QD +Ks MF Td Cf Sy sQ -hd +et OF QD AF @@ -1690,15 +1921,15 @@ AF AF AF AF -QD +hO iq -Rw +hd FZ kI Nr -hd +et EV -QD +hO AF AF AF @@ -1709,7 +1940,7 @@ AF AF xc Mu -Rw +RO rE kb dX From 88113519c5450ee8e1615444f9959507d74d33bb Mon Sep 17 00:00:00 2001 From: Moff Date: Tue, 26 Nov 2024 22:27:02 +0500 Subject: [PATCH 07/11] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D0=B5=D0=B7=20=D0=BB?= =?UTF-8?q?=D0=B5=D0=B3=D0=BA=D0=BE=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=B8=20=D0=A0=D0=9D=D0=94.=20=D0=A7=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=8C=201..=20(#1215)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Массовый порез легкого фулл рнд, часть 1.. * а ой --- .../BeachRuins/beach_crashed_engineer.dmm | 4 +- .../BeachRuins/beach_crashed_starwalker.dmm | 2 - .../BeachRuins/beach_fishing_hut.dmm | 41 ++++++++++++------- .../IceRuins/icemoon_surface_engioutpost.dmm | 2 +- .../JungleRuins/jungle_medtech_outbreak.dmm | 12 +++--- .../JungleRuins/jungle_surface_ikea_ai.dmm | 5 --- .../LavaRuins/lavaland_surface_codelab.dmm | 2 +- .../RockRuins/rockplanet_boxsci.dmm | 25 ++++++----- .../RockRuins/rockplanet_budgetcuts.dmm | 12 +++--- .../RockRuins/rockplanet_harmfactory.dmm | 3 +- .../RockRuins/rockplanet_miningexpedition.dmm | 10 +---- .../RandomRuins/SpaceRuins/astraeus.dmm | 10 ++--- .../SpaceRuins/dangerous_research.dmm | 1 - .../RandomRuins/SpaceRuins/ntfacility.dmm | 6 +-- .../RandomRuins/SpaceRuins/oldstation.dmm | 6 +-- .../SpaceRuins/singularity_lab.dmm | 6 +-- .../wasteplanet_abandoned_mechbay.dmm | 6 +-- 17 files changed, 74 insertions(+), 79 deletions(-) diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 7e58c54971a2..6cbb2b065c86 100644 --- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -116,7 +116,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "dO" = ( /obj/structure/cable, -/obj/machinery/rnd/production/circuit_imprinter/department/engi, +/obj/structure/salvageable/circuit_imprinter, /turf/open/floor/plasteel/tech, /area/ruin/unpowered) "dX" = ( @@ -283,7 +283,7 @@ /area/ruin/unpowered) "mz" = ( /obj/structure/cable, -/obj/machinery/computer/rdconsole/core{ +/obj/structure/salvageable/computer{ dir = 1 }, /turf/open/floor/plasteel/tech, diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm index 248057fb7849..a9508748cf01 100644 --- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm +++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm @@ -646,9 +646,7 @@ /obj/structure/closet/body_bag, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/circuitboard/computer/rdconsole, /obj/item/stack/medical/suture/medicated, -/obj/item/circuitboard/machine/rdserver, /obj/item/circuitboard/machine/protolathe/department/security, /obj/effect/mob_spawn/human/sec, /turf/open/floor/plasteel, diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm index cd9b69f10707..59d1b19f9c7a 100644 --- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm +++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm @@ -79,12 +79,6 @@ }, /area/ruin/beach) "eV" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/fishmeat/carp, -/obj/item/reagent_containers/food/snacks/fishmeat/carp, -/obj/item/reagent_containers/food/snacks/fishmeat/carp, -/obj/item/reagent_containers/food/snacks/fishmeat/carp, -/obj/item/reagent_containers/food/snacks/fishmeat/carp, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, @@ -462,6 +456,11 @@ /obj/item/reagent_containers/food/snacks/fishmeat/carp, /obj/item/reagent_containers/food/snacks/fishmeat/carp, /obj/structure/closet/secure_closet/freezer, +/obj/item/reagent_containers/food/snacks/fishmeat/carp, +/obj/item/reagent_containers/food/snacks/fishmeat/carp, +/obj/item/reagent_containers/food/snacks/fishmeat/carp, +/obj/item/reagent_containers/food/snacks/fishmeat/carp, +/obj/item/reagent_containers/food/snacks/fishmeat/carp, /turf/open/floor/plastic, /area/ruin/beach) "sG" = ( @@ -491,9 +490,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/oxygen{ - anchored = 1 - }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plastic, /area/ruin/beach) "tr" = ( @@ -570,16 +567,27 @@ /area/overmap_encounter/planetoid/cave/explored) "yo" = ( /obj/structure/table/wood/poker, -/obj/item/kirbyplants{ - icon_state = "plant-17"; - pixel_y = 13; - layer = 3 - }, /obj/item/reagent_containers/food/snacks/burger/fish{ pixel_y = -3; pixel_x = 11; layer = 3.1 }, +/obj/item/gun/ballistic/revolver/ashhand{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/ammo_casing/a4570{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_x = 9; + pixel_y = 4 + }, /turf/open/floor/carpet, /area/ruin/beach) "yK" = ( @@ -1182,6 +1190,11 @@ "Ty" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/fishing_rod, +/obj/item/fishing_rod{ + pixel_x = 5; + pixel_y = -2 + }, /turf/open/floor/wood, /area/ruin/beach) "TM" = ( diff --git a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index b514b1c40f9c..b6a26fae6e28 100644 --- a/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -1292,7 +1292,6 @@ }, /area/ruin) "df" = ( -/obj/machinery/rnd/production/protolathe/department/engineering, /obj/machinery/light/small/broken/directional/south, /obj/effect/turf_decal/corner/transparent/neutral/half{ dir = 1 @@ -1300,6 +1299,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/salvageable/protolathe, /turf/open/floor/plasteel/dark{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm index 75b7e390c540..668373301734 100644 --- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm +++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm @@ -2134,9 +2134,6 @@ pixel_y = -33; specialfunctions = 4 }, -/obj/machinery/computer/rdconsole{ - dir = 1 - }, /obj/machinery/button/door{ desc = "A door remote bast door switch."; id = "lablock1"; @@ -2144,6 +2141,9 @@ pixel_x = -7; pixel_y = -23 }, +/obj/structure/salvageable/computer{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/bridge) "Ii" = ( @@ -2274,9 +2274,6 @@ /turf/open/floor/grass, /area/overmap_encounter/planetoid/jungle/explored) "Kl" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2285,6 +2282,9 @@ pixel_x = -7; pixel_y = 4 }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/office) "Km" = ( diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm index 1100b76fd46d..18772c71ae75 100644 --- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm +++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm @@ -22,11 +22,6 @@ desc = "Allows you to to turn a cyborg into a... something."; name = "borg module picker (Unknown)" }, -/obj/item/borg/upgrade/transform{ - desc = "Allows you to to turn a cyborg into a... something."; - name = "borg module picker (Unknown)"; - new_module = /obj/item/robot_module/syndicate_medical - }, /turf/open/floor/wood, /area/ruin/powered) "h" = ( diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm index 859c9c8a4f83..267dd8eb859f 100644 --- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm +++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm @@ -3315,7 +3315,7 @@ name = "Nanotrasen Genetic Research Maintenance" }) "Fy" = ( -/obj/machinery/modular_computer/console/preset/research, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/white, /area/ruin/unpowered/buried_shrine{ name = "Nanotrasen Genetic Research Laboratory" diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_boxsci.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_boxsci.dmm index 939ab9b3d3f0..692da586fd3b 100644 --- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_boxsci.dmm +++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_boxsci.dmm @@ -77,6 +77,7 @@ pixel_x = 6; pixel_y = 25 }, +/obj/item/research_notes/loot/big, /turf/open/floor/plasteel/white, /area/ruin/unpowered) "fB" = ( @@ -139,9 +140,8 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered) "ks" = ( -/obj/machinery/computer/rdconsole/core, /obj/effect/decal/cleanable/dirt, -/obj/item/research_notes/loot/big, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/white, /area/ruin/unpowered) "kz" = ( @@ -279,6 +279,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ruin/unpowered) +"sz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/mmi/posibrain, +/turf/open/floor/plasteel, +/area/ruin/unpowered) "sO" = ( /obj/machinery/light/broken/directional/south, /obj/effect/decal/cleanable/dirt, @@ -478,7 +483,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/rnd/production/protolathe/department/science, +/obj/structure/salvageable/protolathe, /turf/open/floor/plasteel/white, /area/ruin/unpowered) "Hs" = ( @@ -708,7 +713,7 @@ /turf/open/floor/plasteel, /area/ruin/unpowered) "VO" = ( -/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/structure/salvageable/circuit_imprinter, /turf/open/floor/plasteel/white, /area/ruin/unpowered) "VR" = ( @@ -748,11 +753,9 @@ /turf/open/floor/plating/rust, /area/ruin/unpowered) "YD" = ( -/mob/living/simple_animal/bot/firebot/rockplanet{ - icon_state = "firebot1" - }, +/obj/item/mmi/posibrain, /turf/open/floor/plating{ - icon_state = "panelscorched" + icon_state = "platingdmg1" }, /area/ruin/unpowered) "YE" = ( @@ -1002,7 +1005,7 @@ lv uQ lv tW -hS +YD ON RV sO @@ -1050,7 +1053,7 @@ ra sp oo lv -YD +tW iE gW bN @@ -1075,7 +1078,7 @@ ra JY Vp nS -gW +sz Qr gW tW diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index f6b5fb8beea6..22de25b05f71 100644 --- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -364,11 +364,11 @@ /turf/open/floor/plasteel/dark, /area/overmap_encounter/planetoid/rockplanet/explored) "fH" = ( -/obj/machinery/rnd/destructive_analyzer, /obj/structure/railing{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/salvageable/destructive_analyzer, /turf/open/floor/pod/light, /area/ruin/rockplanet/nanotrasen) "fN" = ( @@ -435,7 +435,7 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/structure/salvageable/circuit_imprinter, /turf/open/floor/pod/light, /area/ruin/rockplanet/nanotrasen) "gE" = ( @@ -1397,12 +1397,12 @@ /turf/open/floor/plating/asteroid/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "wj" = ( -/obj/machinery/computer/rdconsole/core{ - dir = 1 - }, /obj/structure/railing{ dir = 8 }, +/obj/structure/salvageable/computer{ + dir = 1 + }, /turf/open/floor/pod/light, /area/ruin/rockplanet/nanotrasen) "wn" = ( @@ -2602,10 +2602,10 @@ /turf/open/water/jungle, /area/overmap_encounter/planetoid/rockplanet/explored) "TI" = ( -/obj/machinery/rnd/production/protolathe/department/science, /obj/structure/railing{ dir = 8 }, +/obj/structure/salvageable/protolathe, /turf/open/floor/pod/light, /area/ruin/rockplanet/nanotrasen) "TL" = ( diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm index 83fe70919b7c..937f7d7a0783 100644 --- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm +++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm @@ -87,7 +87,6 @@ "cg" = ( /obj/structure/rack, /obj/item/stack/sheet/mineral/gold/twenty, -/obj/item/circuitboard/computer/rdconsole, /turf/open/floor/plasteel/patterned, /area/ruin/powered) "ck" = ( @@ -138,8 +137,8 @@ /area/ruin/powered) "dJ" = ( /obj/structure/rack, -/obj/item/circuitboard/machine/techfab/department/cargo, /obj/item/stack/sheet/mineral/diamond/five, +/obj/item/circuitboard/machine/protolathe/department/engineering, /turf/open/floor/plating/rust, /area/ruin/powered) "dN" = ( diff --git a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm index 0002d9d6aa8f..090a7b30c436 100644 --- a/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm +++ b/_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm @@ -146,14 +146,6 @@ "tN" = ( /turf/open/floor/plating/asteroid/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) -"ub" = ( -/obj/machinery/computer{ - dir = 8 - }, -/turf/open/floor/plasteel/rockvault, -/area/ruin/rockplanet/nanotrasen{ - name = "Abandoned Syndicate Mining Facility" - }) "ug" = ( /obj/machinery/suit_storage_unit/mining, /turf/open/floor/plasteel/mono, @@ -1131,7 +1123,7 @@ Vw VL Qr sj -ub +pl Vw ll tN diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm index c20253da91df..2224e0dd60ad 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/astraeus.dmm @@ -1267,6 +1267,7 @@ /area/ruin/space/has_grav/astraeus/munitions) "Ir" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/toggle/labcoat, /turf/open/floor/plasteel/airless, /area/ruin/space/has_grav/astraeus/dorms_med) "Is" = ( @@ -1493,11 +1494,8 @@ /turf/open/floor/plasteel/dark/airless, /area/ruin/space/has_grav/astraeus/bridge) "Ni" = ( -/obj/structure/closet/wall/directional/north, -/obj/item/circuitboard/computer/rdconsole, -/obj/item/clothing/suit/toggle/labcoat, /obj/item/research_notes/loot/big, -/turf/closed/wall, +/turf/open/floor/plasteel/airless, /area/ruin/space/has_grav/astraeus/dorms_med) "Nj" = ( /turf/open/floor/plating/airless, @@ -2514,7 +2512,7 @@ xw Zq Dc Dc -Ni +WL Ir OI vV @@ -2552,7 +2550,7 @@ Oa VY YO vn -oE +Ni Pd UU oE diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm index bfc8a2c7eafa..971d868c75df 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -1002,7 +1002,6 @@ }, /obj/structure/table, /obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/item/circuitboard/computer/rdconsole, /obj/item/multitool, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav) diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm index 564f2790d54f..2a73d1a84db3 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/ntfacility.dmm @@ -1300,11 +1300,11 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/powered) "FE" = ( -/obj/machinery/computer/rdconsole/production{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/salvageable/computer{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ruin/powered) "FI" = ( diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm index 3ad614dd39d5..0fd25b700c6e 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm @@ -993,8 +993,8 @@ }, /area/ruin/space/has_grav/ancientstation) "hJ" = ( -/obj/machinery/computer/rdconsole/core, /obj/effect/decal/cleanable/dirt, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/patterned, /area/ruin/space/has_grav/ancientstation/rnd) "hO" = ( @@ -4098,10 +4098,8 @@ }, /area/ruin/space/has_grav/ancientstation/thetacorridor) "Hb" = ( -/obj/machinery/rnd/production/circuit_imprinter/department/science{ - can_be_unanchored = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/salvageable/circuit_imprinter, /turf/open/floor/plasteel/patterned, /area/ruin/space/has_grav/ancientstation/rnd) "Hg" = ( diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm index a65217b04262..ae785ad0b213 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -3994,7 +3994,7 @@ }, /area/ruin/space/has_grav/singularitylab) "pL" = ( -/obj/machinery/computer/rdconsole/experiment{ +/obj/structure/salvageable/computer{ dir = 8 }, /turf/open/floor/engine, @@ -10819,10 +10819,10 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/singularitylab/engineering) "PI" = ( -/obj/machinery/computer/rdconsole{ +/obj/machinery/light/small/directional/north, +/obj/structure/salvageable/computer{ dir = 4 }, -/obj/machinery/light/small/directional/north, /turf/open/floor/carpet/nanoweave/purple, /area/ruin/space/has_grav/singularitylab/lab) "PJ" = ( diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm index 31c53d09a82e..bebc25e7b57c 100644 --- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm +++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm @@ -1454,11 +1454,11 @@ /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "qN" = ( -/obj/machinery/computer/rdconsole{ - dir = 1 - }, /obj/effect/turf_decal/box/white, /obj/machinery/light/broken/directional/south, +/obj/structure/salvageable/computer{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ruin/wasteplanet/abandoned_mechbay/mechlab) "qO" = ( From 2f48201e5286a3cc093896473a338aff21c12fc3 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Tue, 26 Nov 2024 19:34:43 +0200 Subject: [PATCH 08/11] ADD: IDEA in cargo! (#1203) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added borg, ai core, ai shell to cargo, bots crate in cargo fixed * Minor paper fix in IKEA AI ruin * теперь мой диск будет в безопасности от кодеров * borgs now less accessible --------- Co-authored-by: Yata9arasu --- .../JungleRuins/jungle_surface_ikea_ai.dmm | 2 +- code/modules/cargo/packs/machinery.dm | 5 +- mod_celadon/cargo_items/_cargo_items.dm | 2 +- mod_celadon/cargo_items/_cargo_items.dme | 1 + mod_celadon/cargo_items/code/space_idea.dm | 122 ++++++++++++++++++ mod_celadon/qol/README.md | 3 + mod_celadon/qol/_qol.dm | 3 +- 7 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 mod_celadon/cargo_items/code/space_idea.dm diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm index 18772c71ae75..c10514656f4f 100644 --- a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm +++ b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm @@ -139,7 +139,7 @@ /area/ruin/powered) "Q" = ( /obj/item/paper{ - default_raw_text = "Welcome to your Space Ikea Brand Full AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle. Thank you for shopping Space Ikea!" + default_raw_text = "Welcome to your Space IDEA Brand Deluxe AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists. Thank you for shopping Space IDEA!" }, /turf/open/floor/wood, /area/ruin/powered) diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm index 6e5a12f30f5b..01e8eb80e759 100644 --- a/code/modules/cargo/packs/machinery.dm +++ b/code/modules/cargo/packs/machinery.dm @@ -104,6 +104,8 @@ crate_name = "\improper MULEbot Crate" crate_type = /obj/structure/closet/crate/large + // [CELADON-REMOVE] - CELADON_QoL - Перенос непопулярного и затерявшегося товара в более видное место, дополнение его материалами и инструкциями +/* /datum/supply_pack/machinery/robotics name = "Robotics Assembly Crate" desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains four proximity sensors, four robotic arms, two empty first aid kits, two health analyzers, two red hardhats, two mechanical toolboxes, and two cleanbot assemblies!" @@ -128,7 +130,8 @@ /obj/item/bot_assembly/cleanbot) crate_name = "robotics assembly crate" crate_type = /obj/structure/closet/crate/science - +*/ + // [/CELADON-REMOVE] /* Miscellaneous machines */ diff --git a/mod_celadon/cargo_items/_cargo_items.dm b/mod_celadon/cargo_items/_cargo_items.dm index 0cba42a4afab..da3807f54040 100644 --- a/mod_celadon/cargo_items/_cargo_items.dm +++ b/mod_celadon/cargo_items/_cargo_items.dm @@ -2,5 +2,5 @@ name = "Cargo items" desc = @{"Добавляет новую продукцию в карго: Фул платы РнД, Карго телепорт для продажи, -РнД маяк, Набор для создания плазменного двигателя, Набор ИРП, Вендор плат, шахты, сектех, секДроб."} +РнД маяк, Набор для создания плазменного двигателя, Набор ИРП, Вендор плат, шахты, сектех, секДроб, наборы для: 'сборки борга, оболочки борга для ИИ, ядра ИИ'."} author = "Yata9arasu, Molniz" diff --git a/mod_celadon/cargo_items/_cargo_items.dme b/mod_celadon/cargo_items/_cargo_items.dme index 1511dfd715c0..9fcc21be17bd 100644 --- a/mod_celadon/cargo_items/_cargo_items.dme +++ b/mod_celadon/cargo_items/_cargo_items.dme @@ -13,6 +13,7 @@ #include "code/import.dm" #include "code/ammunition.dm" #include "code/guncase.dm" +#include "code/space_idea.dm" #include "code/packs/mechs.dm" #include "code/packs/costumes_toys.dm" diff --git a/mod_celadon/cargo_items/code/space_idea.dm b/mod_celadon/cargo_items/code/space_idea.dm new file mode 100644 index 000000000000..a3c831f10a53 --- /dev/null +++ b/mod_celadon/cargo_items/code/space_idea.dm @@ -0,0 +1,122 @@ +// IDEA была сделана для силиконов и интересных ящиков с карго для сборки весёлых вещей. Это позволит сделать их доступнее вне РнД кораблей, что и без того редко имели тех. +// Именно поэтому ценники на ИИ и Боргов столь низки +/obj/item/paper/idea + name = "IDEA assembly Instruction" + desc = "Average IDEA boring instructions with bunch of pictures and text" + +/datum/supply_pack/idea + group = "IDEA" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/idea/silicon/ai + name = "AI core assembly crate" + desc = "Get an AI today! Contains everything for AI assembly, empty shell assembly, law changing circuits." + cost = 6500 + contains = list( + /obj/item/paper/idea{ + default_raw_text = "

Thank you for shopping in Space IDEA!

Instructions for assembling AI shell

1. Secure AI core bolts with the provided wrench

2. Insert 'AI core' circuit board inside the slot in core

3. Secure circuit board screws with the provided screwdriver

4. Add wires according to the instructions

5. (Optional) Upload any custom laws that you'd like to this AI core with an AI module. Laws vary.

6. Turn on positronic brain by clicking on a big button on it, while its loading, it will glow yellow

7. Wait for brain to activate, now, it should beep loudly and now glow with light blue actively moving lines.

8. Place active positronic brain inside

9. Add two (2) reinforced glass to the AI shell

10. Secure glass screws with screwdriver

Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists.

" + }, +// Pars for AI shell + /obj/structure/AIcore, + /obj/item/circuitboard/aicore, + /obj/item/stack/sheet/rglass, + /obj/item/stack/sheet/rglass, + /obj/item/stack/cable_coil/red, + /obj/item/mmi/posibrain/ipc, +//Instruments + /obj/item/screwdriver, + /obj/item/wrench/crescent, +// Law circuits + /obj/item/aiModule/reset/purge, + /obj/item/aiModule/reset, + /obj/item/aiModule/core/full/corp, + /obj/item/aiModule/core/full/asimov, + /obj/item/aiModule/core/freeformcore, +// Cameras + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera, + /obj/item/wallframe/camera) + crate_name = "AI core assembly crate" + +/datum/supply_pack/idea/silicon/ai_shell + name = "Cyborg shell for AI" + desc = "Cyborg shell for your AI! Contains cyborg shell assembly kit for an AI and B.O.R.I.S module" + cost = 2250 + contains = list( + /obj/item/paper/idea{ + default_raw_text = "

Thank you for shopping in Space IDEA!

Instructions for assembling AI shell

1. Insert into borg body one (1) power cell and five (5) parts of coil

2. Insert into borg head two (2) flashes

3. Place all cyborg parts on exoskeleton of borg

4. Turn on positronic brain by clicking on a big button on it, while its loading, it will glow yellow

5. Wait for brain to activate, now, it should beep loudly and now glow with light blue actively moving lines.

6. Insert 'B.O.R.I.S Module' module board into the finished shell

7. Shell is ready to be entered by AI.

Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists.

" + }, + /obj/item/borg/upgrade/ai, + /obj/item/bodypart/head/robot, + /obj/item/bodypart/chest/robot, + /obj/item/bodypart/r_arm/robot, + /obj/item/bodypart/l_arm/robot, + /obj/item/bodypart/leg/left/robot, + /obj/item/bodypart/leg/right/robot, + /obj/item/robot_suit, + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high, + /obj/item/assembly/flash/handheld, + /obj/item/assembly/flash/handheld, + /obj/item/stack/cable_coil/red) + crate_name = "AI cyborg shell assembly crate" + +/datum/supply_pack/idea/silicon/robot + name = "Cyborg assembly crate" + desc = "Build your own silicon friend only for 2000 credits! Contains all parts besides law changing circuits and carging station." + cost = 3000 + contains = list(/obj/item/paper/idea{ + default_raw_text = "

Thank you for shopping Space IDEA!

Instructions for assembling YOUR Cyborg

1. Insert into borg body one (1) power cell and five (5) parts of coil

2. Insert into borg head two (2) flashes

3. Place all cyborg parts on exoskeleton of borg

4. Turn on positronic brain by clicking on a big button on it, while its loading, it will glow yellow

5. Wait for brain to activate, now, it should beep loudly and now glow with light blue actively moving lines

6. Place positronic brain inside cyborg

Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists.

" + }, + /obj/item/bodypart/head/robot, + /obj/item/bodypart/chest/robot, + /obj/item/bodypart/r_arm/robot, + /obj/item/bodypart/l_arm/robot, + /obj/item/bodypart/leg/left/robot, + /obj/item/bodypart/leg/right/robot, + /obj/item/robot_suit, + /obj/item/stock_parts/cell/high/plus, + /obj/item/stock_parts/cell/high/plus, + /obj/item/assembly/flash/handheld, + /obj/item/assembly/flash/handheld, + /obj/item/mmi/posibrain/ipc, + /obj/item/stack/cable_coil/red) + crate_name = "Cyborg assembly crate" + +/datum/supply_pack/idea/robotics + name = "Bots Assembly Crate" + desc = "Get your own affordable little helpers, cheaper than a gun! Floor-cleaning, tile-placing, wound-tending, fire-extinguishing botters only for 2100 credits!" + cost = 2500 + contains = list(/obj/item/paper/idea{ + default_raw_text = "

Thank you for shopping Space IDEA!

Instructions for assembling YOUR Bots

For Cleanbot:

1. Attach a robot arm and your Cleanbot is ready!

For Firebot:

1. Attach robot arm to fire extinguisher

2. But on a helmet on the fire extinguisher

3. Insert proximity sensor inside and your Firebot is ready!

For Floorbot:

1. Insert 10 floor tiles in toolbox

2. Insert proximity sensor inside

3. Attach a robot arm and your Floorbot is ready!

For Medibot:

1. Attach robot arm to medkit

2. Attach health sensor for this construction

3. Insert the Proximity Sensor and your Medibot is ready

Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists.

" + }, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/bodypart/r_arm/robot, + /obj/item/bodypart/r_arm/robot, + /obj/item/bodypart/r_arm/robot, + /obj/item/bodypart/r_arm/robot, + /obj/item/storage/firstaid, + /obj/item/storage/firstaid, + /obj/item/healthanalyzer, + /obj/item/healthanalyzer, + /obj/item/clothing/head/hardhat/red, + /obj/item/clothing/head/hardhat/red, + /obj/item/extinguisher, + /obj/item/extinguisher, + /obj/item/stack/tile/plasteel{ + amount = 20 + }, + /obj/item/storage/toolbox/, + /obj/item/storage/toolbox/, + /obj/item/bot_assembly/cleanbot, + /obj/item/bot_assembly/cleanbot) + crate_name = "Bots assembly crate" diff --git a/mod_celadon/qol/README.md b/mod_celadon/qol/README.md index b9e74bca0b19..150b9c04a1a1 100644 --- a/mod_celadon/qol/README.md +++ b/mod_celadon/qol/README.md @@ -107,6 +107,9 @@ ID мода: CELADON_QOL - REMOVE `code/modules/discord/accountlink.dm` -> Убрана неиспользуемая кнопка Verify Discord Account со вкладки ООС - REMOVE `code/modules/discord/toggle_notify.dm` Убрана неиспользуемая кнопка "Notify Restart" со вкладки "ООС" - REMOVE `code/modules/tgui_panel/external.dm` Убрана кнопка "Fix chat" со вкладки "ООС". Устаревшая функция. +Карго +- REMOVE `code\modules\cargo\packs\machinery.dm` Перемещён Robotics crate в + `mod_celadon\cargo_items\code\space_idea.dm`, на более видное место, дополнил деталями для сборки ботов и инструкции по сборке - EDIT `code/modules/clothing/clothing.dm` -> `armor_to_protection_class` -> Замена римских цифр на числовые значения diff --git a/mod_celadon/qol/_qol.dm b/mod_celadon/qol/_qol.dm index e1ade55f92e7..40a1489c23f6 100644 --- a/mod_celadon/qol/_qol.dm +++ b/mod_celadon/qol/_qol.dm @@ -11,5 +11,6 @@ Добавлена поддержка кириллицы для пьяной и запинающейся речи. Добавлена поддержка кириллицы для кастомных эмоутов речи. Добавлено отображение карт, при покупке корабля. -Изменён вид гринтекста, для последующего вывода через бота в Discord"} +Изменён вид гринтекста, для последующего вывода через бота в Discord. +Перенесён Robotics crate во вкладку IDEA, добавлены все детали для сборки ботов, инструкции к сборке."} author = "RalseiDreemuurr, MrCat15352, MysticalFaceLesS, Yata9arasu, MrRomainzZ" From f70a47abf9af976fed4bfdd6c2be79f52c8bd3bb Mon Sep 17 00:00:00 2001 From: Moff Date: Tue, 26 Nov 2024 22:36:20 +0500 Subject: [PATCH 09/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=A2=D0=B8?= =?UTF-8?q?=D1=80-=D0=94=D1=80=D0=BE=D0=BF=D0=B0,=20=D0=9D=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D1=86=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D0=BA=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=A1=D0=BE=D0=BB=D0=A4=D0=B5=D0=B4=D0=B0,=20=D0=98?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=9A=D1=8C=D1=8E=20=D0=B8=20=D0=A1=D0=B8?= =?UTF-8?q?=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=B0=20(#1211)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Изменение цен Интека, Синди и СолФеда * Жестка разное. Фикс Тир-Дропа и небольшое обновление карго Интека, Синдиката и СолФеда * Немного переделал цены и вещи, описания * фиксанул --- .../configs/nanotrasen_teardrop.json | 4 +-- mod_celadon/cargo_items/code/guncase.dm | 22 ++++++++++++++ .../outpost_console/code/supply_pack/inteq.dm | 15 +++++++--- .../code/supply_pack/solfed.dm | 29 +++++++++++++++++-- .../code/supply_pack/syndicate.dm | 27 +++++++++++++++-- .../projectiles/guns/ballistic/assault.dm | 6 ++++ 6 files changed, 91 insertions(+), 12 deletions(-) diff --git a/_maps/_mod_celadon/configs/nanotrasen_teardrop.json b/_maps/_mod_celadon/configs/nanotrasen_teardrop.json index bb5be030c97e..1a17bd831f50 100644 --- a/_maps/_mod_celadon/configs/nanotrasen_teardrop.json +++ b/_maps/_mod_celadon/configs/nanotrasen_teardrop.json @@ -21,7 +21,7 @@ "outfit": "/datum/outfit/job/nanotrasen/captain/lp", "officer": true, "slots": 1 - } + }, "Military technician": { "outfit": "/datum/outfit/job/nanotrasen/engineer/lp", @@ -36,4 +36,4 @@ "slots": 1 } } - +} diff --git a/mod_celadon/cargo_items/code/guncase.dm b/mod_celadon/cargo_items/code/guncase.dm index dc720addfded..3bd31fd4ecf6 100644 --- a/mod_celadon/cargo_items/code/guncase.dm +++ b/mod_celadon/cargo_items/code/guncase.dm @@ -68,4 +68,26 @@ EMPTY_GUN_HELPER(automatic/pistol/deagle) /obj/item/ammo_box/magazine/m556_42_hydra/empty start_empty = TRUE +/obj/item/storage/guncase/f4_308/inteq +/obj/item/storage/guncase/f4_308/inteq/PopulateContents() + new /obj/item/gun/ballistic/automatic/marksman/f4/inteq/no_mag(src) + new /obj/item/ammo_box/magazine/f4_308/empty(src) + new /obj/item/ammo_box/magazine/f4_308/empty(src) +/obj/item/ammo_box/magazine/f4_308/empty + start_empty = TRUE + +/obj/item/storage/guncase/syndicate/cobra +/obj/item/storage/guncase/syndicate/cobra/PopulateContents() + new /obj/item/gun/ballistic/automatic/smg/cobra/no_mag(src) + new /obj/item/ammo_box/magazine/m45_cobra/empty(src) + new /obj/item/ammo_box/magazine/m45_cobra/empty(src) + +/obj/item/storage/guncase/automatic/powered/gauss +/obj/item/storage/guncase/automatic/powered/gauss/PopulateContents() + new /obj/item/gun/ballistic/automatic/powered/gauss/no_mag(src) + new /obj/item/ammo_box/magazine/gauss/empty(src) + new /obj/item/ammo_box/magazine/gauss/empty(src) + +/obj/item/ammo_box/magazine/gauss/empty + start_empty = TRUE diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq.dm b/mod_celadon/outpost_console/code/supply_pack/inteq.dm index 531cda505c66..e2013ac59933 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq.dm +++ b/mod_celadon/outpost_console/code/supply_pack/inteq.dm @@ -5,14 +5,14 @@ name = "SKM-44v Mongrel" desc = "Inteq SMG" contains = list(/obj/item/storage/guncase/skm_carabine) - cost = 3500 + cost = 5000 crate_type = /obj/structure/closet/crate/secure/gear /datum/supply_pack/faction/inteq/gun/bulldog name = "Bulldog Shotgun" desc = "Automatic Shotgun" contains = list(/obj/item/storage/guncase/bulldog/inteq) - cost = 5000 + cost = 8000 /datum/supply_pack/faction/inteq/gun/commanders name = "Commander Pistol Crate" @@ -20,14 +20,21 @@ cost = 750 contains = list(/obj/item/storage/pistolcase/commander/inteq) +/datum/supply_pack/faction/inteq/gun/ssg04/inteq + name = "SSG-04" + desc = "Modified InteQ SSG-04. It have a scope, uses a 308 caliber " + contains = list(/obj/item/storage/guncase/f4_308/inteq) + cost = 9000 + crate_type = /obj/structure/closet/crate/secure/gear + /datum/supply_pack/faction/inteq/clothing // Одежда group = "Faction clothing" /datum/supply_pack/faction/inteq/clothing/hardsuit // Слишком сильно? name = "InteQ hardsuit" desc = "Made by InteQ" - contains = list(/obj/item/clothing/suit/space/hardsuit/syndi/inteq) - cost = 12000 + contains = list(/obj/item/clothing/suit/space/hardsuit/security/independent/inteq) + cost = 4000 /datum/supply_pack/faction/inteq/clothing/spacesuit name = "InteQ spacesuit" diff --git a/mod_celadon/outpost_console/code/supply_pack/solfed.dm b/mod_celadon/outpost_console/code/supply_pack/solfed.dm index ea31702ce9da..c19f98a63f93 100644 --- a/mod_celadon/outpost_console/code/supply_pack/solfed.dm +++ b/mod_celadon/outpost_console/code/supply_pack/solfed.dm @@ -5,7 +5,7 @@ name = "Solar 'GAR' Carbine" desc = "Something on Gauss" contains = list(/obj/item/storage/guncase/gauss) - cost = 2500 + cost = 9000 /datum/supply_pack/faction/solfed/gun/commanders name = "Commander Pistol Crate" @@ -13,6 +13,28 @@ cost = 750 contains = list(/obj/item/storage/pistolcase/commander) +/datum/supply_pack/faction/solfed/gun/gauss/prototype + name = "Prototype gauss rifle" + desc = "A high capacity experimental rifle developed by Nanotrasen" + contains = list(/obj/item/storage/guncase/automatic/powered/gauss) + cost = 6000 + +/datum/supply_pack/faction/solfed/ammo // патроны + group = "Faction ammo" + + +/datum/supply_pack/faction/solfed/ammo/ferrolancebox + name = "Ferromagnetic lance" + desc = "A box of standard ferromagnetic lances" + contains = list(/obj/item/ammo_box/ferrolancebox) + cost = 700 + +/datum/supply_pack/faction/solfed/ammo/ferropellets + name = "A box of ferromagnetic pellets" + desc = "Contains a fifty-round .45" + contains = list(/obj/item/ammo_box/ferropelletbox) + cost = 500 + /datum/supply_pack/faction/solfed/clothing // Одежда group = "Faction clothing" @@ -20,11 +42,12 @@ name = "SolFed hardsuit" desc = "Made in Solar Federation" contains = list(/obj/item/clothing/suit/space/hardsuit/solgov) - cost = 2000 + cost = 11000 /datum/supply_pack/faction/solfed/clothing/med_hardsuit name = "Medical Hardsuit Crate" desc = "One medical hardsuit, resistant to diseases and useful for retrieving patients in space." - cost = 1500 + cost = 4000 contains = list(/obj/item/clothing/suit/space/hardsuit/medical) crate_name = "medical hardsuit crate" + diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate.dm index 62ca0bd88ce5..577b6c298091 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate.dm @@ -5,7 +5,7 @@ name = "PC-76" desc = "Automatic pistol" contains = list(/obj/item/storage/pistolcase/ringneck) - cost = 500 + cost = 700 // /datum/supply_pack/faction/syndicate/gun/deagle // У нас нет коробок для этой пушки, поэтому пока что так // name = "Deagle" @@ -17,13 +17,34 @@ name = "Bulldog Shotgun" desc = "Automatic Shotgun" contains = list(/obj/item/storage/guncase/bulldog) - cost = 5000 + cost = 7000 /datum/supply_pack/faction/syndicate/gun/hydra name = "SMR-80 \"Hydra\"" desc = "Scarborough Arms' premier modular assault rifle platform." contains = list(/obj/item/storage/guncase/hydra) - cost = 3800 + cost = 6400 + +/datum/supply_pack/faction/syndicate/gun/cobra + name = "CR-20 \"Cobra\"" + desc = "A bullpup submachine gun. Chambered in .45" + contains = list(/obj/item/storage/guncase/syndicate/cobra) + cost = 5500 + +/datum/supply_pack/faction/syndicate/ammo // патроны + group = "Faction ammo" + +/datum/supply_pack/faction/syndicate/ammo/smgm45ammo + name = ".45 Cobra Ammo Crate" + desc = "Contains a .45 magazine for the Cobra-20, containing 24 rounds." + cost = 750 + contains = list(/obj/item/ammo_box/magazine/m45_cobra) + +/datum/supply_pack/faction/syndicate/ammo/c45_ammo_box + name = ".45 Ammo Box Crate" + desc = "Contains a fifty-round .45" + contains = list(/obj/item/ammo_box/c45) + cost = 500 /datum/supply_pack/faction/syndicate/clothing // Одежда group = "Faction clothing" diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm index 30c20e44e48e..b354f22df3d4 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm @@ -171,3 +171,9 @@ caliber = "7.62x54" w_class = WEIGHT_CLASS_NORMAL multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/gun/ballistic/automatic/marksman/f4/inteq/no_mag + spawnwithmagazine = FALSE + +/obj/item/gun/ballistic/automatic/powered/gauss/no_mag + spawnwithmagazine = FALSE From 466f7d955c06218ff33648d8a4125e1ecec8b743 Mon Sep 17 00:00:00 2001 From: Moff Date: Tue, 26 Nov 2024 22:40:26 +0500 Subject: [PATCH 10/11] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=A3=D1=82=D1=8E=D0=B3?= =?UTF-8?q?=D0=B0=20(#1219)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm index be57972cea89..1e53c59fe14c 100644 --- a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm +++ b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm @@ -491,8 +491,7 @@ }, /obj/machinery/door/airlock/security/glass{ dir = 4; - name = "Шлюз"; - req_access_txt = "8134" + name = "Шлюз" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1591,10 +1590,10 @@ pixel_y = 6; pixel_x = -9 }, -/obj/machinery/airalarm/directional/west, /obj/item/storage/book/bible/koran{ name = "Терик-аль-Шаед" }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Yr" = ( From f82d86f79f38df02be1409014082d0a339499de1 Mon Sep 17 00:00:00 2001 From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com> Date: Tue, 26 Nov 2024 23:19:05 +0500 Subject: [PATCH 11/11] MAP: Update & Fix Lagoon (#1216) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Переосмысление лагуны * Обновление карты * Вынесение в отдельные аутфиты для Лагуны. Чистка от легаси кода. Добавление денег команде и пассажирам * Убраны кривые стекла * Перемещены аутфиты из коркода в модовую папку * Обновление бара, добавление неона и переключантелей света --- .../configs/independent_lagoon.json | 24 +- .../independent/independent_lagoon.dmm | 1656 ++++++++++++----- mod_celadon/outfit/_outfit.dme | 2 + .../independent/outfit_ship/independent.dm | 229 +++ 4 files changed, 1423 insertions(+), 488 deletions(-) create mode 100644 mod_celadon/outfit/code/independent/outfit_ship/independent.dm diff --git a/_maps/_mod_celadon/configs/independent_lagoon.json b/_maps/_mod_celadon/configs/independent_lagoon.json index eab565c91300..9ab3457784e6 100644 --- a/_maps/_mod_celadon/configs/independent_lagoon.json +++ b/_maps/_mod_celadon/configs/independent_lagoon.json @@ -17,51 +17,51 @@ "namelists": ["CRUISE"], "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/independent/captain", + "outfit": "/datum/outfit/job/independent/captain/lagoon", "slots": 1 }, "Cruise Director": { - "outfit": "/datum/outfit/job/independent/hop", + "outfit": "/datum/outfit/job/independent/hop/lagoon", "slots": 1 }, "Security Officer": { - "outfit": "/datum/outfit/job/independent/security", + "outfit": "/datum/outfit/job/independent/security/lagoon", "slots": 2 }, "Medical Doctor": { - "outfit": "/datum/outfit/job/independent/doctor", + "outfit": "/datum/outfit/job/independent/doctor/lagoon", "slots": 1 }, "Ship Engineer": { - "outfit": "/datum/outfit/job/independent/atmos", + "outfit": "/datum/outfit/job/independent/atmos/lagoon", "slots": 1 }, "Bartender": { - "outfit": "/datum/outfit/job/independent/bartender", + "outfit": "/datum/outfit/job/independent/bartender/lagoon", "slots": 1 }, "Cook": { - "outfit": "/datum/outfit/job/independent/cook", + "outfit": "/datum/outfit/job/independent/cook/lagoon", "slots": 1 }, "Botanist": { - "outfit": "/datum/outfit/job/independent/botanist", + "outfit": "/datum/outfit/job/independent/botanist/lagoon", "slots": 1 }, "Curator": { - "outfit": "/datum/outfit/job/independent/curator", + "outfit": "/datum/outfit/job/independent/curator/lagoon", "slots": 1 }, "Chaplain": { - "outfit": "/datum/outfit/job/independent/chaplain", + "outfit": "/datum/outfit/job/independent/chaplain/lagoon", "slots": 1 }, "Janitor": { - "outfit": "/datum/outfit/job/independent/janitor", + "outfit": "/datum/outfit/job/independent/janitor/lagoon", "slots": 1 }, "Passenger": { - "outfit": "/datum/outfit/job/independent/assistant/fancy", + "outfit": "/datum/outfit/job/independent/assistant/fancy/lagoon", "slots": 10 } } diff --git a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm index eed20b792136..6ce07b776186 100644 --- a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm +++ b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm @@ -28,7 +28,6 @@ /obj/item/clothing/accessory/waistcoat, /obj/item/storage/firstaid/toxin, /obj/item/clothing/suit/armor/vest/alt, -/obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/black, @@ -48,9 +47,43 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"ar" = ( +/obj/machinery/light/directional/south, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/item/clothing/shoes/sandal{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/clothing/shoes/sandal{ + pixel_x = 11; + pixel_y = 13 + }, +/obj/item/clothing/shoes/sandal{ + pixel_y = 8; + pixel_x = 12 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/clothing/shoes/sandal{ + pixel_x = -5; + pixel_y = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/general/other) "as" = ( /obj/machinery/door/airlock/wood{ - name = "Cabin 1" + name = "Cabin 1"; + id_tag = "novip_cab_1" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -230,6 +263,16 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"bk" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/pew/right{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/crew/chapel) "bn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -360,7 +403,8 @@ /area/ship/bridge) "bX" = ( /obj/machinery/door/airlock/wood{ - name = "Cabin 2" + name = "Cabin 2"; + id_tag = "novip_cab_2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -378,6 +422,14 @@ }, /turf/open/floor/wood, /area/ship/crew) +"cc" = ( +/obj/structure/window, +/obj/structure/flora/ausbushes/ywflowers, +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/turf/open/floor/grass, +/area/ship/crew/canteen) "ch" = ( /obj/item/spacecash/bundle/c200, /obj/item/clothing/suit/hawaiian, @@ -389,6 +441,18 @@ }, /turf/open/floor/wood, /area/ship/crew) +"cj" = ( +/obj/machinery/vending/coffee{ + pixel_x = 13; + density = 0; + default_price = 22; + extra_price = 75 + }, +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) "cm" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/wood{ @@ -396,12 +460,18 @@ }, /turf/open/floor/carpet/black, /area/ship/crew) +"ct" = ( +/obj/structure/table/reinforced/glass, +/obj/structure/railing, +/turf/open/floor/light, +/area/ship/crew/canteen/kitchen) "cv" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/office) "cx" = ( /obj/machinery/door/airlock/titanium{ - name = "Cabin 6" + name = "Cabin 6"; + id_tag = "novip_cab_6" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -478,10 +548,13 @@ /turf/open/floor/grass, /area/ship/hallway/central) "cR" = ( -/obj/machinery/computer/arcade/battle, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) +/obj/structure/chair/stool/bar{ + dir = 8; + pixel_x = -8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "cS" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/hydroponics) @@ -540,13 +613,19 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "dr" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder, +/obj/machinery/reagentgrinder{ + pixel_x = 7; + pixel_y = 10 + }, /obj/machinery/firealarm/directional/east, +/obj/structure/table/wood/reinforced/bar, /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "dt" = ( -/obj/machinery/vending/clothing, +/obj/machinery/vending/clothing{ + default_price = 30; + extra_price = 60 + }, /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/starboard) @@ -583,8 +662,9 @@ /turf/open/floor/pod/dark, /area/ship/hallway/port) "dM" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/chair/wood{ + dir = 4; + pixel_x = 10 }, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -624,11 +704,11 @@ /turf/open/floor/wood, /area/ship/crew/library) "dZ" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/eighties, -/area/ship/storage) +/obj/structure/table/wood/poker, +/obj/item/spacecash/bundle/c100, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/ship/crew/office) "ea" = ( /obj/structure/cable{ icon_state = "1-2" @@ -646,18 +726,11 @@ /turf/open/floor/plasteel, /area/ship/external) "ei" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/item/kirbyplants, -/obj/effect/turf_decal/corner/opaque/white/border{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/open/floor/carpet/black, +/area/ship/crew/office) "en" = ( /obj/structure/chair, /turf/open/floor/plasteel, @@ -678,12 +751,14 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "eE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8; + pixel_x = -4 }, -/obj/machinery/roulette, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/item/soap/deluxe, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) "eF" = ( /obj/machinery/vending/autodrobe{ all_items_free = 1 @@ -719,6 +794,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/ship/crew/library) "eR" = ( @@ -743,17 +821,23 @@ /turf/open/floor/plating, /area/ship/engineering) "eT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "2-4" }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_y = 10; - pixel_x = -20 +/obj/machinery/firealarm/directional/north{ + pixel_x = -14 }, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/item/radio/intercom/directional/north{ + pixel_x = 3 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/wood, +/area/ship/general/other) "eX" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 9 @@ -805,6 +889,13 @@ dir = 8 }, /obj/machinery/light/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/ship/hallway/fore) "fs" = ( @@ -936,8 +1027,12 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) "gb" = ( -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/obj/machinery/light/directional/east, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) "ge" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -993,9 +1088,6 @@ /turf/open/floor/pod/dark, /area/ship/hallway/fore) "gI" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -1112,7 +1204,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/chapel) "ht" = ( /obj/structure/cable{ @@ -1142,12 +1234,15 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "hA" = ( -/obj/structure/bookcase/random/fiction, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/structure/chair/pew/right{ + dir = 4 }, -/turf/open/floor/wood, -/area/ship/crew/library) +/obj/structure/chair/pew{ + pixel_x = 7; + pixel_y = 3 + }, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "hK" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1167,15 +1262,16 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "hS" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/flora/ausbushes/ppflowers, +/obj/item/kirbyplants/random{ + pixel_y = 7 }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/corner/opaque/white/border{ - dir = 8 +/obj/structure/window, +/obj/structure/window{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/open/floor/grass, +/area/ship/crew/canteen) "hT" = ( /obj/structure/table/wood, /obj/item/clothing/mask/gas/clown_hat, @@ -1208,15 +1304,8 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "hZ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/corner/opaque/white/border{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/general/other) "ia" = ( /obj/structure/sign/painting/library{ pixel_x = 32 @@ -1290,8 +1379,14 @@ /turf/open/floor/plasteel, /area/ship/crew) "iq" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage) +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) "it" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1448,13 +1543,16 @@ /turf/open/floor/plasteel, /area/ship/external) "jj" = ( -/obj/structure/table/reinforced, /obj/item/reagent_containers/glass/rag, /obj/item/reagent_containers/food/drinks/shaker, /obj/machinery/vending/boozeomat{ pixel_x = 32; all_items_free = 1 }, +/obj/structure/table/wood/reinforced/bar, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "jk" = ( @@ -1471,22 +1569,25 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "jt" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/chair/comfy/grey/directional/south, +/obj/machinery/light/directional/east, +/turf/open/floor/carpet/black, +/area/ship/crew/office) +"jw" = ( +/obj/structure/sauna_oven_steam, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) +"jx" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/item/kirbyplants/random{ + pixel_y = 7 }, -/obj/machinery/computer/arcade, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/light_switch{ - pixel_x = 20; - pixel_y = -12; +/obj/structure/window, +/obj/structure/window{ dir = 8 }, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) -"jw" = ( -/obj/structure/chair/comfy, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/turf/open/floor/grass, +/area/ship/crew/canteen) "jz" = ( /obj/structure/cable{ icon_state = "0-8" @@ -1509,7 +1610,13 @@ /area/ship/crew) "jI" = ( /obj/item/toy/seashell, -/turf/open/floor/plating/beach/sand, +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/turf/open/floor/carpet/green, /area/ship/hallway/central) "jM" = ( /obj/machinery/libraryscanner, @@ -1517,8 +1624,9 @@ /turf/open/floor/carpet/black, /area/ship/crew/library) "jP" = ( -/obj/structure/chair/comfy/grey/directional/west, -/obj/machinery/newscaster/directional/east, +/obj/item/kirbyplants/photosynthetic{ + pixel_x = -10 + }, /turf/open/floor/carpet/black, /area/ship/crew/office) "jS" = ( @@ -1660,7 +1768,11 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "ky" = ( -/obj/structure/closet/athletic_mixed, +/obj/structure/closet/athletic_mixed{ + pixel_x = 17; + pixel_y = 24; + density = 0 + }, /obj/structure/cable{ icon_state = "0-4" }, @@ -1680,6 +1792,9 @@ "kL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/chapel) +"kR" = ( +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "kX" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ @@ -1734,6 +1849,26 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"lt" = ( +/obj/machinery/door/window/survival_pod{ + opacity = 1 + }, +/obj/machinery/door/window/survival_pod{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + req_ship_access = 0 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 1; + pixel_x = -20 + }, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "lx" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -1769,7 +1904,18 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/newscaster/directional/west, +/obj/machinery/button/door{ + pixel_y = -10; + id = "novip_cab_2"; + name = "Bolt Cabin 2"; + dir = 4; + pixel_x = -25; + specialfunctions = 4; + normaldoorcontrol = 1 + }, +/obj/machinery/newscaster/directional/west{ + pixel_y = 6 + }, /turf/open/floor/wood, /area/ship/crew) "lI" = ( @@ -1808,8 +1954,8 @@ /obj/item/clothing/under/dress/blacktango, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/gloves/color/evening, -/obj/item/spacecash/bundle/c100, /obj/machinery/light/directional/north, +/obj/item/spacecash/bundle/c500, /turf/open/floor/carpet/black, /area/ship/crew) "lT" = ( @@ -1924,12 +2070,21 @@ /turf/open/floor/pod/dark, /area/ship/hallway/fore) "mB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/machinery/light/directional/east{ + pixel_x = 25 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/wood, +/area/ship/general/other) "mF" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable{ @@ -2035,8 +2190,15 @@ /turf/open/floor/plasteel, /area/ship/external) "ne" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin{ + pixel_x = 13; + density = 0 + }, +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 }, /turf/open/floor/plasteel, /area/ship/hallway/fore) @@ -2116,20 +2278,38 @@ /area/ship/crew) "nU" = ( /obj/effect/turf_decal/siding/wood, +/obj/machinery/newscaster/directional/west{ + dir = 2; + pixel_x = 0; + pixel_y = -30 + }, /turf/open/floor/wood, /area/ship/crew) "nX" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/closet/wall/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/machinery/door/airlock/gold/glass{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/carpet/black, -/area/ship/crew/office) -"oh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/towel{ + pixel_y = 8; + pixel_x = -11 + }, +/obj/item/towel{ + pixel_x = -7; + pixel_y = 12 + }, +/turf/open/floor/wood, +/area/ship/general/other) +"oe" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/railing/corner, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"oh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "2-4" @@ -2157,12 +2337,8 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "oo" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/corner/opaque/white/border{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/general/other/zone_2) "ot" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/corner/opaque/white/border, @@ -2177,7 +2353,8 @@ /area/ship/hallway/port) "oz" = ( /obj/machinery/door/airlock/titanium{ - name = "Cabin 5" + name = "Cabin 5"; + id_tag = "novip_cab_5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2248,22 +2425,64 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "oV" = ( +/obj/structure/window/reinforced/spawner/west{ + opacity = 1; + dir = 2 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/dresser{ + dir = 4; + pixel_x = -6 + }, +/obj/item/towel{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/towel{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/towel{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/towel{ + pixel_y = 8; + pixel_x = -11 + }, +/obj/item/lighter, +/turf/open/floor/wood, +/area/ship/general/other) +"oW" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 9 }, -/obj/machinery/door/airlock/gold/glass{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/light_switch{ + pixel_x = 20; + pixel_y = -12; dir = 8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/carpet/black, -/area/ship/crew/office) -"oW" = ( -/obj/machinery/vending/cigarette/syndicate, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/general/other) "pc" = ( /obj/effect/turf_decal/corner/opaque/white/border, /obj/machinery/light/directional/south, @@ -2412,9 +2631,14 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "pP" = ( -/obj/machinery/vending/games, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) +/obj/machinery/vending/cigarette/syndicate{ + pixel_x = -6; + default_price = 37; + extra_price = 125 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "pQ" = ( /obj/machinery/door/airlock{ dir = 4 @@ -2438,9 +2662,6 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "pV" = ( -/obj/structure/chair/pew/left{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -2467,9 +2688,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "qa" = ( -/obj/structure/chair/sofa/brown/directional/east{ - icon_state = "sofacorner" - }, +/obj/structure/chair/sofa/brown/corner/directional/east, /turf/open/floor/carpet/nanoweave/blue, /area/ship/hallway/fore) "qe" = ( @@ -2539,9 +2758,7 @@ /turf/open/floor/plating/beach/sand, /area/ship/hallway/central) "qA" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/wood, /area/ship/crew/canteen) "qD" = ( @@ -2608,13 +2825,15 @@ }, /area/ship/bridge) "qU" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/vending/games{ + pixel_x = 13; + density = 0; + default_price = 25; + extra_price = 125 }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/ship/hallway/fore) "qY" = ( @@ -2682,10 +2901,14 @@ /turf/open/floor/wood, /area/ship/crew/hydroponics) "rC" = ( -/obj/machinery/computer/arcade, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) +/obj/structure/window/reinforced/spawner/west{ + opacity = 1 + }, +/obj/effect/turf_decal/borderfloorblack{ + icon_state = "steel_decals9" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) "rD" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2696,6 +2919,7 @@ /area/ship/external) "rF" = ( /obj/structure/altar_of_gods, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/chapel) "rI" = ( @@ -2725,6 +2949,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood, /area/ship/crew/canteen) "rQ" = ( @@ -2749,7 +2977,10 @@ /area/ship/hallway/aft) "rV" = ( /obj/machinery/light/directional/east, -/obj/machinery/vending/cigarette/beach, +/obj/machinery/vending/cigarette/beach{ + default_price = 37; + extra_price = 125 + }, /obj/effect/turf_decal/corner/opaque/white/border{ dir = 5 }, @@ -2768,6 +2999,31 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/machinery/button/door{ + pixel_y = 10; + id = "novip_cab_7"; + name = "Bolt Cabin 7"; + dir = 8; + pixel_x = 24; + specialfunctions = 4; + normaldoorcontrol = 1 + }, +/turf/open/floor/carpet/black, +/area/ship/crew) +"sk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/button/door{ + pixel_y = 10; + id = "novip_cab_5"; + name = "Bolt Cabin 5"; + dir = 8; + pixel_x = 24; + specialfunctions = 4; + normaldoorcontrol = 1 + }, /turf/open/floor/carpet/black, /area/ship/crew) "sm" = ( @@ -2886,10 +3142,10 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "sT" = ( -/obj/machinery/computer/arcade/orion_trail, /obj/machinery/airalarm/directional/north, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) +/obj/machinery/computer/slot_machine, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "ta" = ( /turf/open/floor/plating/beach/coastline_t, /area/ship/hallway/central) @@ -2926,7 +3182,10 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "tp" = ( -/obj/structure/dresser, +/obj/structure/dresser{ + dir = 4; + pixel_x = -6 + }, /obj/effect/turf_decal/siding/wood/end{ dir = 8 }, @@ -2950,9 +3209,12 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/canteen/kitchen) "tx" = ( -/obj/structure/table/wood/poker, -/obj/item/spacecash/bundle/c100, -/turf/open/floor/light/colour_cycle/dancefloor_a, +/obj/structure/chair/stool/bar{ + dir = 1; + pixel_y = 18 + }, +/obj/machinery/computer/helm/viewscreen/directional/east, +/turf/open/floor/carpet/black, /area/ship/crew/office) "tA" = ( /obj/structure/disposalpipe/segment, @@ -2981,14 +3243,32 @@ /turf/open/floor/grass, /area/ship/hallway/central) "tH" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/closet/wall/directional/west, +/obj/structure/closet/wall/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 + dir = 4 + }, +/obj/item/towel{ + pixel_y = 8; + pixel_x = -11 + }, +/obj/item/towel{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/towel{ + pixel_x = -5; + pixel_y = 8 }, -/turf/open/floor/eighties, -/area/ship/storage) +/obj/item/towel{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/ship/general/other) "tJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3015,23 +3295,37 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/canteen) "tY" = ( -/obj/machinery/vending/cola/starkist, +/obj/machinery/vending/cola/starkist{ + default_price = 22; + extra_price = 100 + }, /obj/effect/turf_decal/corner/opaque/white/border{ dir = 1 }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "ub" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/door/window/survival_pod{ + opacity = 1 }, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ship/general/other) "ue" = ( -/obj/machinery/vending/snack/green, +/obj/machinery/vending/snack/green{ + default_price = 30; + extra_price = 80 + }, /obj/effect/turf_decal/corner/opaque/white/border{ dir = 5 }, @@ -3104,6 +3398,7 @@ }, /obj/structure/closet/wardrobe/mixed, /obj/machinery/airalarm/directional/north, +/obj/item/spacecash/bundle/c1000, /turf/open/floor/wood, /area/ship/crew/dorm) "uO" = ( @@ -3181,12 +3476,25 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "vg" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/grass, /area/ship/crew/canteen) "vj" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/corner/opaque/black/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /obj/structure/cable{ icon_state = "4-8" @@ -3216,9 +3524,7 @@ /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "vB" = ( -/obj/structure/chair/sofa/brown/directional/east{ - icon_state = "sofaend_right" - }, +/obj/structure/chair/sofa/brown/right/directional/east, /turf/open/floor/carpet/nanoweave/blue, /area/ship/hallway/fore) "vD" = ( @@ -3281,11 +3587,16 @@ /turf/open/floor/wood, /area/ship/crew/hydroponics) "vP" = ( -/obj/structure/chair/pew/left{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/carpet, -/area/ship/crew/chapel) +/obj/structure/bed/double, +/obj/item/bedsheet/double/brown, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/ship/crew) "vU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -3312,7 +3623,8 @@ /area/ship/hallway/port) "wd" = ( /obj/machinery/door/airlock/titanium{ - name = "Cabin 7" + name = "Cabin 7"; + id_tag = "novip_cab_7" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3418,8 +3730,12 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) "wP" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, +/obj/structure/bed/double{ + dir = 1 + }, +/obj/item/bedsheet/double/black{ + dir = 1 + }, /turf/open/floor/carpet/black, /area/ship/crew) "wT" = ( @@ -3453,11 +3769,20 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "wZ" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/structure/fluff/beach_umbrella/cap, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/turf_decal/weather/sand{ dir = 8 }, -/turf/open/floor/wood, -/area/ship/crew/chapel) +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/beach/sand + }, +/area/ship/hallway/central) "xc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3624,6 +3949,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/carpet, /area/ship/crew/chapel) +"yi" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "yj" = ( /obj/machinery/vending/dinnerware{ all_items_free = 1 @@ -3633,9 +3964,9 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "yl" = ( -/obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "ym" = ( @@ -3720,12 +4051,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/eighties, -/area/ship/storage) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "yI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3793,8 +4124,9 @@ /obj/machinery/door/poddoor/shutters/preopen{ id = "cruisewindows" }, +/obj/structure/curtain/bounty, /turf/open/floor/plating, -/area/ship/storage) +/area/ship/crew/office) "zd" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/corner/opaque/lightgrey/border{ @@ -3803,23 +4135,57 @@ /turf/open/floor/pod/dark, /area/ship/hallway/fore) "ze" = ( -/obj/machinery/vending/cola, -/obj/effect/turf_decal/corner/opaque/white/border{ - dir = 4 +/obj/machinery/roulette, +/obj/machinery/firealarm/directional/north, +/obj/machinery/newscaster/directional/north{ + pixel_x = 15 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/open/floor/carpet/black, +/area/ship/crew/office) "zf" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/ship/hallway/central) +"zg" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) +"zr" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/window, +/turf/open/floor/grass, +/area/ship/crew/canteen) "zs" = ( -/obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/burger/fish, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) +"zt" = ( +/obj/machinery/door/window/survival_pod{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) "zz" = ( /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, @@ -3838,6 +4204,15 @@ "zI" = ( /turf/open/floor/pod/light, /area/ship/hallway/port) +"zL" = ( +/obj/structure/railing, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 1; + pixel_x = -20 + }, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/canteen) "zN" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee{ @@ -3890,6 +4265,16 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel, /area/ship/hallway/fore) +"zT" = ( +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) "zW" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/chair/pew/left{ @@ -3959,7 +4344,6 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "An" = ( -/obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 5; pixel_y = 5 @@ -3967,6 +4351,7 @@ /obj/item/reagent_containers/condiment/peppermill, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "As" = ( @@ -4006,21 +4391,23 @@ /turf/open/floor/plating, /area/ship/cargo) "AB" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood, +/obj/structure/railing, +/obj/structure/chair/sofa/grey/left/directional/west, /turf/open/floor/wood, /area/ship/crew/canteen) "AD" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/item/towel{ + pixel_y = 7 }, -/obj/effect/turf_decal/corner/opaque/black/border{ - dir = 4 +/obj/item/towel{ + pixel_y = 11 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/obj/item/towel{ + pixel_y = 15 + }, +/turf/open/floor/plating/beach/coastline_t, +/area/ship/hallway/central) "AI" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating/beach/water, @@ -4036,10 +4423,37 @@ /turf/open/floor/plasteel, /area/ship/external) "AW" = ( -/obj/machinery/vending/wardrobe/chap_wardrobe, +/obj/machinery/vending/wardrobe/chap_wardrobe{ + all_items_free = 1; + pixel_y = 20; + default_price = 175; + extra_price = 225 + }, /obj/effect/turf_decal/siding/wood/end{ dir = 1 }, +/obj/structure/closet/wall/directional/west, +/obj/item/reagent_containers/food/snacks/grown/moonflower, +/obj/item/reagent_containers/food/snacks/grown/moonflower, +/obj/item/reagent_containers/food/snacks/grown/moonflower, +/obj/item/storage/fancy/candle_box{ + pixel_x = 12 + }, +/obj/item/storage/fancy/candle_box{ + pixel_x = 12 + }, +/obj/item/clothing/head/plastic_flower, +/obj/item/clothing/head/plastic_flower, +/obj/item/clothing/head/peaceflower, +/obj/item/clothing/head/peaceflower, +/obj/item/clothing/head/peaceflower, +/obj/effect/spawner/lootdrop/flower, +/obj/effect/spawner/lootdrop/flower, +/obj/item/clothing/under/dress/flower, +/obj/item/grown/novaflower, +/obj/item/grown/novaflower, +/obj/item/grown/sunflower, +/obj/item/grown/sunflower, /turf/open/floor/wood, /area/ship/crew/chapel) "AX" = ( @@ -4073,15 +4487,29 @@ /turf/open/floor/engine/n2, /area/ship/engineering) "Bi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/window/reinforced/spawner/west{ + opacity = 1 }, -/obj/structure/chair/stool/bar{ - dir = 4 +/obj/structure/sink/kitchen{ + dir = 1 + }, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = 11; + pixel_y = -6; + layer = 2 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) +"Bj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 1; + pixel_x = -20 }, -/obj/machinery/light/directional/south, /turf/open/floor/carpet/black, -/area/ship/crew/office) +/area/ship/crew/canteen/kitchen) "Bl" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -4110,6 +4538,13 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/fore) +"Bp" = ( +/obj/structure/chair/wood{ + dir = 8; + pixel_x = -10 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "Bt" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4118,16 +4553,19 @@ /turf/open/floor/plating, /area/ship/crew/chapel) "Bw" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/wood, /area/ship/crew/chapel) "Bz" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -4160,15 +4598,17 @@ /turf/open/floor/grass, /area/ship/hallway/central) "BO" = ( -/obj/machinery/door/airlock/public/glass, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, -/turf/open/floor/eighties, -/area/ship/storage) +/obj/machinery/door/airlock/gold/glass{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "BP" = ( /obj/machinery/autolathe, /obj/effect/turf_decal/corner/opaque/white/border{ @@ -4193,7 +4633,23 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "BW" = ( -/obj/machinery/computer/helm/viewscreen/directional/east, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/item/skateboard/hoverboard{ + pixel_x = -4 + }, +/obj/structure/table/glass, +/obj/item/clothing/shoes/wheelys{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 10; + pixel_x = -20 + }, /turf/open/floor/carpet/black, /area/ship/crew/office) "BX" = ( @@ -4235,6 +4691,15 @@ "Ci" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/canteen/kitchen) +"Ck" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/crew/chapel) "Co" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4270,12 +4735,14 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Cx" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/red, /turf/open/floor/wood, /area/ship/crew/canteen) "Cy" = ( -/obj/item/kirbyplants/photosynthetic, -/obj/machinery/airalarm/directional/north, +/obj/structure/chair/stool/bar{ + dir = 4; + pixel_x = 9 + }, /turf/open/floor/carpet/black, /area/ship/crew/office) "CD" = ( @@ -4305,7 +4772,10 @@ /turf/open/floor/plasteel, /area/ship/hallway/port) "CM" = ( -/obj/machinery/vending/autodrobe, +/obj/machinery/vending/autodrobe{ + default_price = 90; + extra_price = 180 + }, /obj/effect/turf_decal/corner/opaque/white/border{ dir = 6 }, @@ -4323,7 +4793,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "CR" = ( -/obj/structure/table/reinforced, +/obj/structure/table/reinforced/glass, /turf/open/floor/light, /area/ship/crew/canteen/kitchen) "CS" = ( @@ -4366,11 +4836,19 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/turf/open/floor/wood, +/obj/item/kirbyplants/random{ + pixel_y = 6 + }, +/turf/open/floor/carpet, /area/ship/crew/chapel) "Dh" = ( -/obj/machinery/jukebox, -/obj/machinery/light/directional/north, +/obj/machinery/jukebox{ + pixel_y = 18; + density = 0 + }, +/obj/machinery/light/directional/north{ + pixel_y = 35 + }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -4393,9 +4871,7 @@ /turf/open/floor/plating, /area/ship/crew/janitor) "Ds" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/structure/chair/sofa/grey/right/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "Dv" = ( @@ -4417,12 +4893,11 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "DD" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/structure/railing, +/obj/structure/chair/sofa/grey/right/directional/west, /turf/open/floor/wood, /area/ship/crew/canteen) "DK" = ( @@ -4466,19 +4941,25 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "DT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/newscaster/directional/north{ - pixel_x = 30 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/white/border{ +/obj/machinery/door/airlock/wood{ dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/birch, +/area/ship/general/other) "DZ" = ( /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, @@ -4501,7 +4982,12 @@ /area/ship/crew/canteen) "Ef" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/ship/crew/library) "Eg" = ( @@ -4530,7 +5016,8 @@ /area/ship/hallway/starboard) "El" = ( /obj/machinery/door/airlock/wood{ - name = "Cabin 3" + name = "Cabin 3"; + id_tag = "novip_cab_3" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4538,11 +5025,13 @@ /turf/open/floor/wood, /area/ship/crew) "Er" = ( -/obj/structure/table/reinforced, /obj/item/table_bell, /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, +/obj/structure/table/reinforced/titaniumglass, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) "Et" = ( @@ -4623,10 +5112,12 @@ /turf/open/floor/pod/light, /area/ship/hallway/fore) "EN" = ( -/obj/item/kirbyplants/photosynthetic, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/structure/chair/pew{ + pixel_y = 3 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "EP" = ( /obj/structure/chair, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -4722,9 +5213,17 @@ /turf/closed/wall/mineral/titanium, /area/ship/hallway/port) "Fr" = ( -/obj/machinery/computer/slot_machine, -/turf/open/floor/carpet/black, +/obj/machinery/computer/arcade{ + dir = 1 + }, +/turf/open/floor/light/colour_cycle/dancefloor_b, /area/ship/crew/office) +"Fv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/ship/crew/chapel) "Fw" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) @@ -4758,13 +5257,14 @@ /turf/open/floor/engine, /area/ship/engineering) "FJ" = ( -/obj/structure/bookcase/random/nonfiction, -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/obj/machinery/shower{ + dir = 8; + pixel_x = -4 }, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, -/area/ship/crew/library) +/obj/structure/curtain, +/obj/item/soap/deluxe, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/general/other) "FO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4809,6 +5309,13 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"FY" = ( +/obj/structure/chair/pew/left{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "Gb" = ( /obj/machinery/vending/security/wall{ pixel_x = -28; @@ -4854,10 +5361,21 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Gs" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/structure/curtain/bounty, -/turf/open/floor/plating, -/area/ship/crew/office) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/button/door{ + pixel_y = 10; + id = "novip_cab_6"; + name = "Bolt Cabin 6"; + dir = 8; + pixel_x = 24; + specialfunctions = 4; + normaldoorcontrol = 1 + }, +/turf/open/floor/carpet/black, +/area/ship/crew) "Gw" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/turf_decal/weather/sand, @@ -4954,11 +5472,19 @@ /turf/open/floor/plating, /area/ship/cargo) "GZ" = ( -/obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks{ - dir = 8 + dir = 8; + pixel_x = 6 + }, +/obj/machinery/newscaster/directional/east{ + pixel_y = -15 + }, +/obj/structure/table/wood/reinforced/bar, +/obj/machinery/light/colored/blue{ + dir = 4; + pixel_y = 9; + pixel_x = 8 }, -/obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "Hc" = ( @@ -4969,13 +5495,11 @@ /turf/open/floor/plating, /area/ship/engineering) "He" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /obj/machinery/newscaster/directional/east, +/obj/structure/chair/pew/right{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/chapel) "Hg" = ( @@ -5088,6 +5612,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/office) "Ie" = ( +/obj/structure/railing, /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "Ig" = ( @@ -5105,15 +5630,19 @@ /turf/open/floor/plating, /area/ship/crew/hydroponics) "Iw" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/white/border{ +/obj/effect/turf_decal/weather/sand{ dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/item/clothing/shoes/sandal{ + pixel_x = 19 + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/beach/sand + }, +/area/ship/hallway/central) "Iy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5161,13 +5690,14 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "IJ" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/machinery/light/directional/west, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/chair/sofa/grey/left/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "IX" = ( @@ -5217,18 +5747,25 @@ /area/ship/external) "Jq" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/eighties, -/area/ship/storage) -"Jr" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cruisewindows" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/carpet/black, /area/ship/crew/office) +"Jr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/crew/chapel) "Js" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -5292,34 +5829,24 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "JA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/opaque/black/border{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/open/floor/carpet/lone, +/area/ship/crew/chapel) "JC" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/structure/cable, /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/chair/sofa/grey/left/directional/east, /turf/open/floor/wood, /area/ship/crew/canteen) "JD" = ( /obj/effect/turf_decal/siding/wood, /obj/item/radio/intercom/directional/south, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "JF" = ( @@ -5331,7 +5858,9 @@ /turf/open/floor/carpet/black, /area/ship/crew/office) "JN" = ( -/obj/machinery/vending/wardrobe/jani_wardrobe, +/obj/machinery/vending/wardrobe/jani_wardrobe{ + all_items_free = 1 + }, /turf/open/floor/plating, /area/ship/crew/janitor) "JP" = ( @@ -5346,6 +5875,13 @@ }, /turf/open/floor/plasteel, /area/ship/external) +"JR" = ( +/obj/item/stack/sheet/mineral/wood/fifty{ + pixel_x = 11; + pixel_y = 6 + }, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "JX" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/wood{ @@ -5366,7 +5902,13 @@ /area/ship/crew/janitor) "Kd" = ( /obj/item/toy/beach_ball, -/turf/open/floor/plating/beach/sand, +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/turf/open/floor/carpet/red, /area/ship/hallway/central) "Kh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -5558,7 +6100,9 @@ /turf/open/floor/carpet, /area/ship/crew/chapel) "LD" = ( -/obj/item/reagent_containers/spray/spraytan, +/obj/item/reagent_containers/spray/spraytan{ + pixel_y = -8 + }, /turf/open/floor/plating/beach/sand, /area/ship/hallway/central) "LF" = ( @@ -5693,7 +6237,8 @@ /area/ship/hallway/starboard) "Mz" = ( /obj/structure/table/wood, -/obj/item/nullrod, +/obj/effect/spawner/lootdrop/flower, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/chapel) "MD" = ( @@ -5701,6 +6246,19 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel, /area/ship/hallway/fore) +"ML" = ( +/obj/machinery/light/directional/west, +/obj/structure/chair/pew/left{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ship/crew/chapel) "MM" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -5743,10 +6301,9 @@ /turf/open/floor/wood, /area/ship/crew) "Np" = ( -/obj/structure/chair/comfy/grey/directional/east, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/carpet/black, -/area/ship/crew/office) +/obj/item/radio/intercom/directional/south, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "Nr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 4 @@ -5915,14 +6472,21 @@ icon_state = "1-2" }, /obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/chapel) "OM" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/candle_box, -/obj/item/flashlight/lantern, +/obj/item/storage/fancy/candle_box{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/flashlight/lantern{ + pixel_x = -7; + pixel_y = 6 + }, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 6 }, /turf/open/floor/wood, /area/ship/crew/chapel) @@ -5941,20 +6505,25 @@ /turf/open/floor/pod/dark, /area/ship/hallway/fore) "Pa" = ( -/obj/machinery/vending/snack/teal, -/obj/effect/turf_decal/corner/opaque/white/border{ +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/turf/open/floor/carpet/black, +/area/ship/crew/office) "Pc" = ( /obj/machinery/air_sensor/atmos/incinerator_tank, /turf/open/floor/engine, /area/ship/engineering) "Pe" = ( -/obj/effect/turf_decal/siding/wood/corner{ +/obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/ship/crew/library) "Pg" = ( @@ -6020,15 +6589,15 @@ /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "Pv" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/corner/opaque/white/bordercorner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/ship/hallway/fore) "Pw" = ( @@ -6052,8 +6621,18 @@ /turf/open/floor/carpet, /area/ship/crew/chapel) "PE" = ( -/turf/open/floor/eighties, -/area/ship/storage) +/obj/effect/overlay/coconut{ + pixel_x = 33 + }, +/obj/structure/fluff/beach_umbrella/syndi, +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/ship/hallway/central) "PF" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west, @@ -6073,10 +6652,21 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew/toilet) +"PI" = ( +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) "PL" = ( -/obj/machinery/vending/donksofttoyvendor, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/ship/storage) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/office) "PS" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6098,7 +6688,18 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/newscaster/directional/west, +/obj/machinery/newscaster/directional/west{ + pixel_y = 6 + }, +/obj/machinery/button/door{ + pixel_y = -10; + id = "novip_cab_1"; + name = "Bolt Cabin 1"; + dir = 4; + pixel_x = -25; + specialfunctions = 4; + normaldoorcontrol = 1 + }, /turf/open/floor/wood, /area/ship/crew) "PX" = ( @@ -6131,6 +6732,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "Qg" = ( @@ -6324,7 +6928,18 @@ dir = 9 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/light/dim/directional/west, +/obj/machinery/light/dim/directional/west{ + pixel_y = 10 + }, +/obj/machinery/button/door{ + pixel_y = -10; + id = "novip_cab_3"; + name = "Bolt Cabin 3"; + dir = 4; + pixel_x = -25; + specialfunctions = 4; + normaldoorcontrol = 1 + }, /turf/open/floor/wood, /area/ship/crew) "QZ" = ( @@ -6376,6 +6991,10 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"Rg" = ( +/obj/structure/chair/sofa/grey/left/directional/west, +/turf/open/floor/wood, +/area/ship/crew/canteen) "Ri" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6397,12 +7016,13 @@ /turf/open/floor/grass/fairy, /area/ship/crew) "Rm" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/chair/sofa/grey/right/directional/west, /turf/open/floor/wood, /area/ship/crew/canteen) "Ro" = ( @@ -6446,8 +7066,8 @@ /obj/item/clothing/suit/toggle/lawyer/black, /obj/item/clothing/neck/tie/blue, /obj/item/pen/fountain, -/obj/item/spacecash/bundle/c100, /obj/machinery/light/directional/north, +/obj/item/spacecash/bundle/c500, /turf/open/floor/carpet/black, /area/ship/crew) "RC" = ( @@ -6499,6 +7119,17 @@ }, /turf/open/floor/wood, /area/ship/crew/hydroponics) +"RO" = ( +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/grass, +/area/ship/crew/canteen/kitchen) "RR" = ( /turf/open/floor/plating/beach/coastline_b, /area/ship/hallway/central) @@ -6526,6 +7157,9 @@ dir = 8 }, /obj/machinery/light/small/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plasteel, /area/ship/hallway/fore) "RZ" = ( @@ -6575,6 +7209,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/structure/railing, /turf/open/floor/wood, /area/ship/crew/canteen) "Sj" = ( @@ -6608,8 +7243,9 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "SH" = ( -/obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, +/obj/structure/railing, +/obj/structure/table/wood/fancy/royalblack, /turf/open/floor/wood, /area/ship/crew/canteen) "SK" = ( @@ -6664,11 +7300,18 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Tq" = ( -/obj/effect/turf_decal/siding/wood/corner{ +/obj/structure/flora/ausbushes/brflowers, +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/obj/structure/window{ dir = 8 }, -/turf/open/floor/wood, -/area/ship/crew/chapel) +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/grass, +/area/ship/crew/canteen) "Tr" = ( /obj/effect/turf_decal/corner/opaque/white/border{ dir = 4 @@ -6693,6 +7336,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/ship/crew/library) "Tz" = ( @@ -6736,10 +7382,12 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "TK" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, /obj/effect/turf_decal/siding/wood{ - dir = 8 + dir = 5 }, -/obj/machinery/light/directional/west, /turf/open/floor/wood, /area/ship/crew/chapel) "TL" = ( @@ -6753,13 +7401,16 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "TM" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/carpet, +/obj/structure/chair/pew/left{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, /area/ship/crew/chapel) "TO" = ( /obj/structure/railing{ @@ -6783,6 +7434,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/item/spacecash/bundle/c10000, /turf/open/floor/wood, /area/ship/bridge) "TU" = ( @@ -6796,16 +7448,14 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "TX" = ( -/obj/structure/table, -/obj/item/clothing/shoes/wheelys{ - pixel_x = 4; - pixel_y = 9 +/obj/structure/chair/pew/left{ + dir = 1 }, -/obj/item/skateboard/hoverboard{ - pixel_x = -4 +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/turf/open/floor/eighties, -/area/ship/storage) +/turf/open/floor/wood, +/area/ship/crew/chapel) "Ua" = ( /obj/structure/window/plasma/reinforced/spawner, /obj/structure/window/plasma/reinforced/spawner/east, @@ -6995,8 +7645,14 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "Vs" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/machinery/vending/snack/teal{ + pixel_x = 13; + density = 0; + default_price = 30; + extra_price = 80 + }, +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 }, /turf/open/floor/plasteel, /area/ship/hallway/fore) @@ -7226,6 +7882,10 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"WL" = ( +/obj/structure/table/wood/fancy/royalblack, +/turf/open/floor/wood, +/area/ship/crew/canteen) "WR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -7347,16 +8007,19 @@ /obj/item/clothing/under/suit/black/female, /obj/item/clothing/neck/tie/red, /obj/item/toy/cards/deck/syndicate, -/obj/item/spacecash/bundle/c100, /obj/machinery/light/directional/north, +/obj/item/spacecash/bundle/c500, /turf/open/floor/carpet/black, /area/ship/crew) "Xz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/chair/pew/right{ + dir = 1 + }, /obj/effect/turf_decal/siding/wood{ - dir = 8 + dir = 4 }, /turf/open/floor/wood, /area/ship/crew/chapel) @@ -7455,15 +8118,34 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"Yq" = ( +/obj/machinery/vending/cola{ + pixel_x = 13; + density = 0; + default_price = 22; + extra_price = 100 + }, +/obj/effect/turf_decal/corner/opaque/white/border{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/hallway/fore) "Yu" = ( /obj/effect/turf_decal/corner/opaque/white/border{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plasteel, /area/ship/hallway/fore) "Yw" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, +/obj/structure/window, +/obj/item/kirbyplants/random{ + pixel_y = 7 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, /area/ship/crew/canteen/kitchen) "YF" = ( /obj/structure/curtain, @@ -7485,6 +8167,10 @@ /obj/effect/turf_decal/corner/opaque/white/border{ dir = 1 }, +/obj/machinery/vending/donksofttoyvendor{ + pixel_y = 22; + density = 0 + }, /turf/open/floor/plasteel, /area/ship/hallway/fore) "YN" = ( @@ -7507,6 +8193,16 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"YX" = ( +/obj/structure/chair/pew/right{ + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_y = -16; + pixel_x = 18 + }, +/turf/open/floor/wood/ebony, +/area/ship/general/other/zone_2) "YZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7575,13 +8271,20 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "Zx" = ( -/obj/structure/flora/tree/palm, -/obj/effect/overlay/coconut, +/obj/structure/flora/tree/palm{ + pixel_x = 1 + }, /turf/open/floor/plating/beach/sand, /area/ship/hallway/central) "ZA" = ( -/obj/item/clothing/shoes/sandal, -/turf/open/floor/plating/beach/sand, +/obj/structure/fluff/beach_umbrella/engine, +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/turf/open/floor/carpet/green, /area/ship/hallway/central) "ZH" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ @@ -7592,10 +8295,11 @@ /turf/open/floor/plating, /area/ship/engineering) "ZJ" = ( -/obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/beer{ - dir = 8 + dir = 8; + pixel_x = 6 }, +/obj/structure/table/wood/reinforced/bar, /turf/open/floor/carpet/black, /area/ship/crew/canteen/kitchen) "ZK" = ( @@ -8340,8 +9044,8 @@ Qt Wl CN Qt -vg -vg +Tq +zr Qt Qt Qt @@ -8375,7 +9079,7 @@ ZK Oe xh UG -ib +zL rP uO xA @@ -8385,7 +9089,7 @@ Rm Qc IJ DD -vg +jx bj pZ Qy @@ -8421,12 +9125,12 @@ pq qA qA rb -Cx -Cx +WL +WL rb -Cx +WL SH -vg +cc oP lI Oy @@ -8463,11 +9167,11 @@ qA qA rb Ds -Ds +Rg rb Ds AB -vg +hS kd pZ Qy @@ -8562,7 +9266,7 @@ Kl IX Mm cx -sg +Gs XC Rw Ko @@ -8668,9 +9372,9 @@ Ca yl Qg rb -Ds +Bp rb -Ds +Bp Xb Qt kd @@ -8685,7 +9389,7 @@ Kl LP Mm oz -sg +sk XC Rw Ko @@ -8712,7 +9416,7 @@ rb rb rb rb -Xb +oe Qt yI Tz @@ -8761,7 +9465,7 @@ Qy kl Kl RH -GN +vP dG Kl IX @@ -8794,7 +9498,7 @@ Ci CR CR CR -CR +ct Yw oP lI @@ -8831,12 +9535,12 @@ bC ie OB La -La +Bj Pt Qi WR Ie -Yw +RO kd pZ WJ @@ -8963,7 +9667,7 @@ zW LV cP gf -qx +PE Kd ta RR @@ -9045,8 +9749,8 @@ fs Eg cP Tt -qx -qx +wZ +Iw ta RR dN @@ -9129,7 +9833,7 @@ BI id ZA jI -ta +AD RR AI Pw @@ -9208,11 +9912,11 @@ ll TA zS qE -Yu +iq RV Yu Yu -hS +Yu fq Yu Pv @@ -9248,16 +9952,16 @@ Rc bL iD ic -gb +dk ne +Yq Vs -Vs -Vs +cj qU -Vs -Vs +zT +PI vj -rI +zg lf rD ZK @@ -9289,17 +9993,17 @@ Pe Ef TA HF -dk -Iw -ze -Pa +WV +oo +oo +oo oo hZ -AD -JA +hZ +hZ DT -ei -lf +hZ +hZ rD ZK ZK @@ -9326,21 +10030,21 @@ TA TA TA TA -FJ -hA +TA +TA TA YG WV -cv -cv -cv -cv -cv +oo +hA +FY +oo +tH nX oV -cv -cv -mt +ar +hZ +hZ rD ZK ZK @@ -9364,23 +10068,23 @@ Wa kL AW Or -wZ td -kL -kL -kL +Fv +ML +TX +Jr kL BT it -cv +oo EN Np -JJ +oo eT mB ub oW -cv +hZ sa Uv ZK @@ -9406,22 +10110,22 @@ kL kL xJ Mz -Tq +PD TK Xz -td +bk kL yP WV -Gs -HW -Zt -Et -JJ -JJ +oo +YX +kR +oo +zt +rC Bi -cv -cv +hZ +hZ rD ZK ZK @@ -9447,21 +10151,21 @@ hj Bt rm rF +JA PD -vP pV LB Um sI WV -Gs +oo jw -Ej -Et -JJ -lj +JR +lt +gb +FJ eE -Jr +hZ sa bs ZK @@ -9495,14 +10199,14 @@ xc yh Dc WV -Gs -HW -tx -Et -JJ -lj -Fr -Jr +cv +cv +cv +cv +cv +cv +cv +cv rD ZK ZK @@ -9530,7 +10234,7 @@ kL VG OM hs -hs +Ck He Dg kL @@ -9539,11 +10243,11 @@ wX cv Cy jP -JJ +pP BW lj Fr -Jr +cv rD ZK ZK @@ -9578,11 +10282,11 @@ kL yq zb cv -cv -cv -cv -cv -cv +ze +Pa +ei +yi +JJ cv cv rD @@ -9618,13 +10322,13 @@ HE HE qw MD -iq +cv cR -dZ -rC -dZ PL -iq +HW +Zt +Et +zc sa bs ZK @@ -9662,9 +10366,9 @@ Vl BO yD Jq -tH -PE -TX +HW +Ej +Et zc rD ZK @@ -9700,13 +10404,13 @@ Wf xn KH vV -iq +cv sT -dZ +tx jt dZ -pP -iq +Et +zc rD ZK ZK @@ -9741,13 +10445,13 @@ mt mt QJ VF -iq -iq -iq -iq -iq -iq -iq +cv +cv +cv +cv +cv +cv +cv rD ZK ZK diff --git a/mod_celadon/outfit/_outfit.dme b/mod_celadon/outfit/_outfit.dme index c84ffa1216a0..57d3fb6bf8ff 100644 --- a/mod_celadon/outfit/_outfit.dme +++ b/mod_celadon/outfit/_outfit.dme @@ -17,6 +17,8 @@ #include "code/gamma/gamma.dm" +#include "code/independent/outfit_ship/independent.dm" + #include "code/inteq/armor.dm" #include "code/inteq/cards_ids.dm" #include "code/inteq/inteq_outfit.dm" diff --git a/mod_celadon/outfit/code/independent/outfit_ship/independent.dm b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm new file mode 100644 index 000000000000..52c2edfa1b71 --- /dev/null +++ b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm @@ -0,0 +1,229 @@ +/datum/outfit/job/independent/assistant/fancy/lagoon + name = "Independent - Fancy (Formal Uniform)" + + shoes = /obj/item/clothing/shoes/laceup + uniform = /obj/item/clothing/under/misc/assistantformal + head = /obj/item/clothing/head/beret/grey + l_pocket = /obj/item/spacecash/bundle/c500 + +/datum/outfit/job/independent/captain/lagoon + name = "Independent - Captain" + job_icon = "captain" + jobtype = /datum/job/captain + + id = /obj/item/card/id/gold + gloves = /obj/item/clothing/gloves/color/captain + ears = /obj/item/radio/headset/headset_com + uniform = /obj/item/clothing/under/rank/command/captain + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/caphat + backpack_contents = list(/obj/item/melee/classic_baton/telescopic = 1, + /obj/item/spacecash/bundle/c500 = 1) + + backpack = /obj/item/storage/backpack/captain + satchel = /obj/item/storage/backpack/satchel/cap + duffelbag = /obj/item/storage/backpack/duffelbag/captain + courierbag = /obj/item/storage/backpack/messenger/com + + accessory = /obj/item/clothing/accessory/medal/gold/captain + + chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain) + +// Head of Personnel + +/datum/outfit/job/independent/hop/lagoon + name = "Independent - Head of Personnel" + job_icon = "headofpersonnel" + jobtype = /datum/job/head_of_personnel + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/headset_com + uniform = /obj/item/clothing/under/rank/command/head_of_personnel + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain + shoes = /obj/item/clothing/shoes/sneakers/brown + + backpack_contents = list(/obj/item/storage/box/ids = 1, + /obj/item/melee/classic_baton/telescopic=1, + /obj/item/modular_computer/tablet/preset/advanced = 1, + /obj/item/spacecash/bundle/c500 = 1) + + backpack = /obj/item/storage/backpack/captain + satchel = /obj/item/storage/backpack/satchel/cap + duffelbag = /obj/item/storage/backpack/duffelbag/captain + courierbag = /obj/item/storage/backpack/messenger/com + + chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel) + +// Head of Security + +/datum/outfit/job/independent/security/lagoon + name = "Independent - Security Officer" + jobtype = /datum/job/officer + job_icon = "securityofficer" + + ears = /obj/item/radio/headset/alt + uniform = /obj/item/clothing/under/rank/security/officer + gloves = /obj/item/clothing/gloves/color/black + head = /obj/item/clothing/head/helmet/sec + suit = /obj/item/clothing/suit/armor/vest/alt + dcoat = /obj/item/clothing/suit/hooded/wintercoat/security + shoes = /obj/item/clothing/shoes/jackboots + l_pocket = /obj/item/restraints/handcuffs + backpack_contents = null + + backpack = /obj/item/storage/backpack/security + backpack_contents = list(/obj/item/spacecash/bundle/c100 = 3) + + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/sec + courierbag = /obj/item/storage/backpack/messenger/sec + box = /obj/item/storage/box/survival/security + + chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet) + //The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state + +// Engineer + +/datum/outfit/job/independent/doctor/lagoon + name = "Independent - Medical Doctor" + job_icon = "medicaldoctor" + jobtype = /datum/job/doctor + + ears = /obj/item/radio/headset/headset_med + uniform = /obj/item/clothing/under/rank/medical/doctor/blue + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/apron/surgical + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical + + backpack = /obj/item/storage/backpack/medic + backpack_contents = list(/obj/item/spacecash/bundle/c100 = 3) + + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med + courierbag = /obj/item/storage/backpack/messenger/med + + box = /obj/item/storage/box/survival/medical + + chameleon_extras = /obj/item/gun/syringe + +// Atmos Tech + +/datum/outfit/job/independent/atmos/lagoon + name = "Independent - Atmos Tech" + jobtype = /datum/job/atmos + job_icon = "atmospherictechnician" + + belt = /obj/item/storage/belt/utility/atmostech + ears = /obj/item/radio/headset/headset_eng + uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard + dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering + l_pocket = /obj/item/analyzer + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + + box = /obj/item/storage/box/survival/engineer + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1, + /obj/item/spacecash/bundle/c100 = 3) + +// Cook + +/datum/outfit/job/independent/cook/lagoon + name = "Independent - Cook" + jobtype = /datum/job/cook + job_icon = "cook" + + ears = /obj/item/radio/headset/headset_srv + shoes = /obj/item/clothing/shoes/laceup + uniform = /obj/item/clothing/under/rank/civilian/chef + suit = /obj/item/clothing/suit/toggle/chef + alt_suit = /obj/item/clothing/suit/apron/chef + head = /obj/item/clothing/head/chefhat + mask = /obj/item/clothing/mask/fakemoustache/italian + backpack_contents = list(/obj/item/sharpener = 1) + +// Bartender + +/datum/outfit/job/independent/bartender/lagoon + name = "Independent - Bartender" + + glasses = /obj/item/clothing/glasses/sunglasses/reagent + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/rank/civilian/bartender + alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple + alt_suit = /obj/item/clothing/suit/apron/purple_bartender + suit = /obj/item/clothing/suit/armor/vest + backpack_contents = list(/obj/item/storage/box/beanbag=1) + shoes = /obj/item/clothing/shoes/laceup + accessory = /obj/item/clothing/accessory/waistcoat + +// Curator + +/datum/outfit/job/independent/curator/lagoon + name = "Independent - Curator" + job_icon = "curator" + jobtype = /datum/job/curator + + shoes = /obj/item/clothing/shoes/laceup + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/rank/civilian/curator + l_hand = /obj/item/storage/bag/books + l_pocket = /obj/item/key/displaycase + accessory = /obj/item/clothing/accessory/pocketprotector/full + backpack_contents = list( + /obj/item/choice_beacon/hero = 1, + /obj/item/barcodescanner = 1 + ) + +// Chaplain + +/datum/outfit/job/independent/chaplain/lagoon + name = "Independent - Chaplain" + job_icon = "chaplain" + jobtype = /datum/job/chaplain + + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/rank/civilian/chaplain + backpack_contents = list( + /obj/item/stamp/chap = 1, + /obj/item/camera/spooky = 1 + ) + + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + + chameleon_extras = /obj/item/stamp/chap + +// Janitor + +/datum/outfit/job/independent/janitor/lagoon + name = "Independent - Janitor" + job_icon = "janitor" + jobtype = /datum/job/janitor + + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/rank/civilian/janitor + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +// Botanist + +/datum/outfit/job/independent/botanist/lagoon + name = "Independent - Botanist" + job_icon = "botanist" + jobtype = /datum/job/hydro + + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/color/green + dcoat = /obj/item/clothing/suit/hooded/wintercoat/hydro + suit = /obj/item/clothing/suit/apron/overalls + gloves =/obj/item/clothing/gloves/botanic_leather + suit_store = /obj/item/plant_analyzer + + backpack = /obj/item/storage/backpack/botany + satchel = /obj/item/storage/backpack/satchel/hyd + courierbag = /obj/item/storage/backpack/messenger/hyd