From f1e1a8099de6f3c12d26bf028fb601918a52ea0e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 3 Nov 2024 11:31:53 +0100 Subject: [PATCH] Reflavors the Li Tieguai-class. (#3485) ## About The Pull Request Li Tieg is now more similar to #3323 style-wise, with the difference that it's in Biodynamics teal instead of fully in VS red.
Screenshots:

![scrnshot1](https://github.com/user-attachments/assets/335a85a0-12e2-44ad-af38-d09f5d627396) ![StrongDMM-2024-10-17 21 02 51](https://github.com/user-attachments/assets/a57ed1da-4f3b-4684-a263-d8d2f92def42) ![StrongDMM-2024-10-06 23 02 48](https://github.com/user-attachments/assets/94d32a52-614a-4fc0-856f-bca24d952be9)

Also tweaks Li Tieg's weaponry: - Trauma team looses one Ringneck, but gains a Rattlesnake. - Rattlesnake is just cool. - Captain looses the Viper. It's replaced by a Himehabu and an edagger. - A Himehabu fits CS caps waaaay better than a Viper. Edagger is also CS special. - Director looses the Ringneck and the Dart Gun. They only get an edagger now. Sorry. - I'd say they really don't need a gun. Edagger is cool though. ## Why It's Good For The Game Please stop with the carpets and curtains. I beg you. ## Changelog :cl: tweak: Reflavored Li Tieguai-class to use Cybersun Biodynamics colors. balance: Removed the Viper, the Dart Gun and two Ringnecks from the Li Tieguai. Instead, added a Rattlesnake, a Himehabu and two edaggers. fix: Li Tieguai captain is now an officer. /:cl: --- ...json => syndicate_cybersun_litieguai.json} | 3 +- ...i.dmm => syndicate_cybersun_litieguai.dmm} | 2439 ++++++++++------- .../decals/turfdecal/flooring_decals.dm | 2 + .../objects/items/storage/filled_guncases.dm | 8 + .../manufacturer/scarborough/ballistics.dm | 3 + 5 files changed, 1425 insertions(+), 1030 deletions(-) rename _maps/configs/{syndicate_litieguai.json => syndicate_cybersun_litieguai.json} (93%) rename _maps/shuttles/syndicate/{syndicate_litieguai.dmm => syndicate_cybersun_litieguai.dmm} (66%) diff --git a/_maps/configs/syndicate_litieguai.json b/_maps/configs/syndicate_cybersun_litieguai.json similarity index 93% rename from _maps/configs/syndicate_litieguai.json rename to _maps/configs/syndicate_cybersun_litieguai.json index 4680ebe932d6..41fb97deb3ac 100644 --- a/_maps/configs/syndicate_litieguai.json +++ b/_maps/configs/syndicate_cybersun_litieguai.json @@ -8,7 +8,7 @@ "tags": [ "Medical" ], - "map_path": "_maps/shuttles/syndicate/syndicate_litieguai.dmm", + "map_path": "_maps/shuttles/syndicate/syndicate_cybersun_litieguai.dmm", "namelists": [ "SPACE", "BEASTS", @@ -17,6 +17,7 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/cybersun", + "officer": true, "slots": 1 }, "Medical Director": { diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_litieguai.dmm similarity index 66% rename from _maps/shuttles/syndicate/syndicate_litieguai.dmm rename to _maps/shuttles/syndicate/syndicate_cybersun_litieguai.dmm index 750f3016b14e..0591010c5b10 100644 --- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_litieguai.dmm @@ -9,17 +9,19 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/chair/office/light{ dir = 8 }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/science) "an" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/central) +/area/ship/crew/office/lobby) "as" = ( /obj/machinery/computer/operating{ dir = 8 @@ -28,23 +30,24 @@ id = "traumasurgery"; name = "Surgery Shutter Control"; pixel_x = -7; - pixel_y = 23 + pixel_y = 21 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/mono/dark, /area/ship/medical/surgery) "ba" = ( /obj/structure/mirror{ - pixel_x = 25 + pixel_x = 21; + pixel_y = 1; + layer = 2.89 }, /obj/structure/sink{ dir = 8; pixel_y = 0; pixel_x = 12 }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/freezer, +/obj/structure/chair/handrail, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "bu" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -52,7 +55,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ @@ -62,11 +65,15 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/starboard) "bv" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "bz" = ( /obj/machinery/light/small/directional/south, /obj/machinery/power/ship_gravity, @@ -86,7 +93,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/airlock/command{ @@ -102,54 +109,51 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 - }, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "bT" = ( -/obj/machinery/smartfridge/bloodbank/preloaded{ - density = 0; - pixel_y = 0; - pixel_x = 32 - }, -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/stasis{ dir = 8 }, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "cd" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plating, +/obj/effect/turf_decal/isf_small/left, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "cK" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light/small/directional/east, /obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/port) "cL" = ( @@ -158,15 +162,45 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/paper_bin, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/industrial/hatch/red, -/obj/item/folder/white, -/obj/item/pen, -/turf/open/floor/plating, -/area/ship/cargo) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/obj/machinery/button/door{ + dir = 4; + id = "lobbydoors"; + name = "Lobby Door Bolts Control"; + normaldoorcontrol = 1; + pixel_x = 6; + pixel_y = 8; + specialfunctions = 4 + }, +/obj/machinery/button/door{ + dir = 4; + id = "lobbydoors"; + name = "Lobby Door Control"; + normaldoorcontrol = 1; + pixel_x = 6; + pixel_y = -4 + }, +/obj/machinery/button/door{ + dir = 4; + id = "traumalobby"; + name = "Lobby Shutter Control"; + pixel_x = -6; + pixel_y = -4 + }, +/obj/machinery/button/shieldwallgen{ + dir = 4; + id = "traumashield"; + name = "Lobby Holoshield"; + pixel_x = -5; + pixel_y = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office/lobby) "dl" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -174,10 +208,10 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/airlock/freezer{ name = "Research" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/tech/grid, @@ -185,27 +219,26 @@ "eo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/medical{ +/obj/machinery/door/airlock/public{ name = "Bathroom" }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "eS" = ( -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "eT" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/computer/rdconsole/core{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/south, @@ -215,7 +248,10 @@ pixel_y = -16 }, /obj/machinery/light/directional/west, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/ship/science) "fe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -228,10 +264,12 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/science) "fo" = ( /obj/machinery/door/firedoor/border_only{ @@ -243,7 +281,7 @@ /obj/machinery/door/airlock/medical{ name = "Surgery" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/tech/grid, @@ -252,61 +290,73 @@ /turf/closed/wall/mineral/titanium, /area/ship/maintenance/port) "fW" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 +/obj/machinery/holopad/emergency/medical{ + secure = 1; + name = "secure advanced medical holopad" }, -/obj/machinery/holopad/emergency/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "fX" = ( /obj/effect/spawner/random/vending/snack, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 8 - }, -/obj/structure/sign/poster/official/cleanliness{ +/obj/structure/sign/poster/contraband/cybersun{ pixel_y = 32 }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal, +/obj/machinery/camera/autoname{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "gf" = ( -/obj/effect/turf_decal/industrial/outline/red, -/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/structure/closet/crate/freezer/surplus_limbs{ + anchored = 1 + }, /obj/machinery/airalarm/directional/south, /obj/machinery/firealarm/directional/east, /obj/machinery/iv_drip, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, /area/ship/storage) "gL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo) "gW" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 11; + pixel_y = -16 + }, +/obj/structure/cable/yellow, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "hF" = ( /obj/structure/table/reinforced, -/obj/machinery/fax/syndicate, -/turf/open/floor/plasteel/dark, +/obj/machinery/fax/syndicate{ + pixel_y = 6; + layer = 3.09 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "hQ" = ( /obj/structure/table/optable, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/mono/dark, /area/ship/medical/surgery) "hS" = ( -/obj/effect/turf_decal/industrial/hatch/red, /obj/machinery/firealarm/directional/west, /obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/item/storage/box/syringes, /obj/item/storage/box/bodybags, /obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/light_switch{ @@ -314,15 +364,26 @@ pixel_y = 22 }, /obj/structure/closet/secure_closet{ - name = "mortuary locker" + name = "mortuary locker"; + anchored = 1 + }, +/obj/effect/turf_decal/box/white, +/obj/machinery/camera/autoname{ + dir = 5 }, /turf/open/floor/plasteel/tech, /area/ship/medical/surgery) "hW" = ( -/obj/structure/dresser{ +/obj/structure/bed{ dir = 8 }, -/turf/open/floor/carpet/cyan, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/carpet/nanoweave, /area/ship/crew) "ih" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -344,15 +405,12 @@ /obj/structure/bed{ dir = 8 }, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/blue{ - dir = 8 - }, +/obj/structure/curtain/cloth/grey, +/obj/item/bedsheet/black, /obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/nanoweave, /area/ship/crew) "iz" = ( -/obj/effect/landmark/start/paramedic, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -360,178 +418,227 @@ dir = 4 }, /obj/machinery/light/directional/north, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/crew) "iA" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew) "iC" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/wood/ebony, +/obj/structure/table/chem{ + name = "kitchen counter" + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/trash/plate{ + pixel_y = -5; + pixel_x = 5 + }, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_y = 4; + pixel_x = -4 + }, +/obj/structure/sign/poster/contraband/cybersun_borg{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, /area/ship/crew) "iQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "iW" = ( -/turf/open/floor/carpet/cyan, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = -8 + }, +/turf/open/floor/carpet/nanoweave, /area/ship/crew) "jh" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, +/obj/structure/table/chem{ + name = "kitchen counter" + }, /obj/item/radio/intercom/directional/west, -/turf/open/floor/wood/ebony, +/obj/item/reagent_containers/food/drinks/dry_ramen{ + pixel_x = 7; + list_reagents = null; + pixel_y = 7 + }, +/obj/structure/sink/chem{ + name = "kitchen sink"; + dir = 4; + pixel_x = -5; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, /area/ship/crew) "jK" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, /obj/machinery/door/poddoor{ dir = 1; id = "traumaramp" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/engine, -/area/ship/storage/eva) +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "jU" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "ke" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/curtain/cloth, +/obj/structure/catwalk/over, /turf/open/floor/plating, -/area/ship/science) +/area/ship/external/dark) "kh" = ( -/obj/machinery/power/terminal{ - dir = 8 +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "kw" = ( /obj/structure/chair{ dir = 8 }, -/obj/effect/landmark/start/assistant, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#332521" +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/wood/ebony, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel/dark, /area/ship/crew) "la" = ( /obj/structure/railing{ dir = 10 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/storage/eva) -"li" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, +/area/ship/cargo) +"li" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "lJ" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/warning{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -16 +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8; + color = "#FFFFFF" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "lS" = ( -/obj/structure/chair, +/obj/structure/chair/bench/grey/directional/south, /obj/machinery/light/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "lX" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/structure/chair/bench/grey/directional/north, /obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "mo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/machinery/photocopier, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/carpet/cyan, -/area/ship/hallway/central) +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = -12 + }, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/office/lobby) "mu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) "mx" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/autolathe, /obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/science) "mP" = ( /obj/structure/sign/departments/medbay/alt, @@ -539,11 +646,11 @@ /area/ship/maintenance/port) "na" = ( /obj/effect/spawner/random/vending/cola, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 1 }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "nb" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 @@ -552,9 +659,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical/surgery) "nu" = ( @@ -564,7 +672,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/nanoweave, /area/ship/crew) "nI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -573,38 +681,33 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/medical{ - name = "Treatment Center" +/obj/machinery/door/airlock/medical/glass{ + name = "Treatment Center"; + req_ship_access = 0 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/tech/grid, /area/ship/medical) "nW" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -16 - }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "oc" = ( -/obj/effect/turf_decal/corner/opaque/red/full, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/cybersunteal/half{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "ot" = ( /obj/machinery/door/poddoor/preopen{ dir = 8; @@ -613,26 +716,27 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) "oA" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "pf" = ( /obj/docking_port/stationary{ dwidth = 8; @@ -642,40 +746,36 @@ /turf/template_noop, /area/template_noop) "pK" = ( -/turf/open/floor/carpet/cyan, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/office/lobby) "pQ" = ( -/obj/effect/turf_decal/corner/opaque/red/full, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/cybersunteal/half{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "qr" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; id = "traumashield2" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor{ id = "traumaramp" }, -/turf/open/floor/engine, -/area/ship/storage/eva) +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "qv" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -683,18 +783,23 @@ id = "traumastore"; name = "Storage Shutter Control"; pixel_x = -7; - pixel_y = -22 + pixel_y = -20 }, /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, /obj/item/storage/box/masks, /obj/item/storage/box/masks, /obj/item/storage/box/pillbottles, -/obj/structure/closet/wall/white/chem{ - dir = 4; - name = "Medical Supplies Locker"; - pixel_x = -28 +/obj/structure/closet/wall/white/directional/west{ + icon_door = "chemical_wall"; + name = "Medical Supplies Locker" }, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/clothing/mask/breath/medical, /turf/open/floor/plasteel/tech, /area/ship/storage) "qA" = ( @@ -707,79 +812,62 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/medical) "qW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/mob/living/simple_animal/hostile/retaliate/poison/snake{ - desc = "The CMO's pet snake. The question of what species it actually belongs to is a mystery for the ages."; - dir = 8; - name = "\proper Deuce" - }, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "A comfy-looking... snake bed? There's bits of shed scales stuck in the bedding..."; - name = "snake bed" - }, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/white, /area/ship/bridge) "rk" = ( /obj/machinery/rnd/production/techfab/department/medical, -/obj/effect/turf_decal/industrial/hatch/red, -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/science) "rn" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "rA" = ( -/obj/structure/cable, +/obj/structure/cable/yellow, /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 1; id = "traumashield" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "traumalobby"; - name = "Lobby" +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor{ + dir = 4; + id = "traumalobby" }, -/turf/open/floor/engine, -/area/ship/cargo) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/office/lobby) "rJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/effect/turf_decal/industrial/warning{ - dir = 8 + dir = 9; + color = "#FFFFFF" }, /obj/machinery/button/door{ dir = 2; @@ -788,18 +876,23 @@ pixel_x = -5; pixel_y = 22 }, -/turf/open/floor/plating, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "rS" = ( /obj/structure/toilet{ dir = 8 }, -/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/window/reinforced/survival_pod, /obj/machinery/door/window/survival_pod{ dir = 8 }, -/obj/structure/curtain, -/turf/open/floor/plasteel/freezer, +/obj/structure/curtain/cloth{ + color = "#4C9C9C" + }, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "rT" = ( /turf/closed/wall/mineral/titanium, @@ -808,90 +901,91 @@ /obj/machinery/stasis{ dir = 8 }, -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "sx" = ( /obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/stairs/right{ - dir = 1 +/turf/open/floor/plasteel/stairs/left{ + dir = 1; + color = "#777777" }, -/area/ship/storage/eva) +/area/ship/cargo) "sC" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, +/obj/machinery/door/firedoor/heavy, /obj/docking_port/mobile{ dir = 4; launch_status = 0; preferred_direction = 4; port_direction = 2 }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "traumalobby"; - name = "Lobby" +/obj/machinery/door/poddoor{ + dir = 4; + id = "traumalobby" }, -/turf/open/floor/engine, -/area/ship/cargo) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/office/lobby) "sI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/light/small/directional/east, /obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/starboard) "sO" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/structure/bodycontainer/morgue{ dir = 1 }, /obj/machinery/light/directional/south, /obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/mono/dark, /area/ship/medical/surgery) "tb" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/reagent_dispensers/watertank, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/obj/item/storage/bag/trash, /obj/machinery/light/small/directional/east, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/structure/cable/cyan{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "tn" = ( -/turf/closed/wall/mineral/titanium, -/area/ship/storage/eva) -"tF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/turf/open/floor/plasteel/white, +/area/ship/hallway/central) +"tF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "tI" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -907,18 +1001,18 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "tJ" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/light_switch{ dir = 8; pixel_x = 19; pixel_y = -12 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, /obj/structure/closet/crate/freezer{ - name = "organ freezer" + name = "organ freezer"; + anchored = 1 }, /obj/item/organ/heart/cybernetic, /obj/item/organ/heart/cybernetic, @@ -932,13 +1026,22 @@ /obj/item/organ/stomach/cybernetic, /obj/item/organ/eyes/robotic, /obj/item/organ/eyes/robotic, +/obj/effect/turf_decal/box/white, +/obj/machinery/camera/autoname{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/storage) "tO" = ( -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) +/obj/effect/turf_decal/corner/opaque/cybersunteal{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) "tT" = ( -/obj/structure/closet/secure_closet/personal/patient, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, /obj/item/clothing/under/rank/medical/gown, /obj/item/clothing/under/rank/medical/gown, /obj/item/clothing/under/rank/medical/gown/blue, @@ -948,8 +1051,11 @@ /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, /obj/item/clothing/shoes/sandal/slippers, -/obj/effect/turf_decal/industrial/outline/red, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "uc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -958,100 +1064,104 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5; - color = "#332521" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/wood/ebony, +/turf/open/floor/plasteel/dark, /area/ship/crew) "up" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "us" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/light_switch{ dir = 1; pixel_y = -19; pixel_x = -8 }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "uE" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "uT" = ( -/obj/effect/turf_decal/industrial/loading, /obj/machinery/defibrillator_mount/loaded{ - pixel_y = 0; - pixel_x = -32 + pixel_y = 7; + pixel_x = -26 }, -/obj/structure/sink{ +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/structure/sink/kitchen{ + layer = 3.09; + name = "large sink"; dir = 4; - pixel_y = 0; - pixel_x = -13 + pixel_y = -5 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/medical/surgery) "uU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/medical{ - name = "Storage Room" +/obj/machinery/door/airlock/freezer{ + name = "Cargo Bay" }, /turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/area/ship/cargo) "vj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/structure/closet/secure_closet/wall/directional/north{ - icon_state = "sec_wall"; + icon_state = "solgov_wall"; name = "firearms locker"; req_access_txt = "5" }, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/gun/ballistic/automatic/pistol/ringneck, -/obj/item/gun/ballistic/automatic/pistol/ringneck, -/obj/item/gun/ballistic/automatic/pistol/ringneck, /obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/cybersunteal{ + dir = 6 + }, +/obj/structure/chair/handrail{ + dir = 8 + }, +/obj/item/storage/guncase/pistol/pc76, +/obj/item/storage/guncase/pistol/pc76, +/obj/item/storage/guncase/pistol/rattlesnake, +/obj/item/storage/box/ammo/c22lr, +/obj/item/storage/box/ammo/c9mm, +/obj/item/storage/box/ammo/c10mm, +/obj/item/storage/box/ammo/c10mm, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/crew) "vn" = ( -/obj/machinery/smartfridge/organ{ - density = 0; - pixel_x = 32 - }, /obj/structure/table/glass, /obj/machinery/cell_charger, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "vx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -1059,14 +1169,13 @@ }, /obj/structure/catwalk/over, /turf/open/floor/plating, -/area/ship/external) +/area/ship/external/dark) "vE" = ( /obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" + dir = 4 }, /obj/effect/landmark/start/captain, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "wb" = ( /turf/closed/wall/mineral/titanium, @@ -1077,7 +1186,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ @@ -1085,35 +1194,51 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) +/area/ship/crew/office/lobby) "wp" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/rnd/server, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/science) "wr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/airalarm/directional/north, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel/freezer, +/obj/structure/closet/wall/directional/west, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 8 + }, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/soap/syndie, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "wt" = ( /obj/structure/closet/emcloset/wall/directional/north, -/obj/effect/turf_decal/number/two, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "xa" = ( /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/light/small/directional/north, /obj/effect/turf_decal/industrial/warning{ - dir = 10 + dir = 10; + color = "#FFFFFF" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "xp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1122,110 +1247,119 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/structure/sign/poster/official/help_others{ +/obj/structure/sign/poster/contraband/cybersun_med{ pixel_y = 32 }, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "xB" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 4 +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 8; + pixel_y = 19 }, -/obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/cargo) -"xF" = ( -/obj/machinery/computer/helm{ +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1; + color = "#FFFFFF" + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{ + dir = 4 + }, +/obj/structure/chair/handrail{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) +"xF" = ( +/obj/machinery/computer/cargo{ + dir = 8; + icon_keyboard = "syndie_key"; + icon_state = "computer-left" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "xN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/siding/wood{ - dir = 6; - color = "#332521" - }, -/turf/open/floor/wood/ebony, +/turf/open/floor/plasteel/dark, /area/ship/crew) "xW" = ( -/obj/machinery/power/port_gen/pacman, /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/stack/sheet/mineral/plasma/twenty, -/obj/item/radio/intercom/directional/south, +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "yf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/dark, /area/ship/crew) "yn" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/power/shieldwallgen/atmos/roundstart{ id = "traumashield" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "traumalobby"; - name = "Lobby" +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/poddoor{ + dir = 4; + id = "traumalobby" }, -/turf/open/floor/engine, -/area/ship/cargo) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/office/lobby) "yQ" = ( /obj/machinery/computer/med_data{ - dir = 8 + dir = 8; + icon_state = "computer-right" }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "yT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 + dir = 8; + color = "#FFFFFF" }, /obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "yX" = ( -/obj/effect/turf_decal/corner/opaque/red/full, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/cybersunteal/half, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "zh" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/bottle/formaldehyde{ @@ -1244,38 +1378,39 @@ }, /obj/item/reagent_containers/syringe, /obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "zl" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/central) -"zn" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5 - }, -/obj/item/stamp/cmo{ - pixel_x = -1; - pixel_y = 12 +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 8 }, -/obj/item/pen{ - pixel_x = -5 +/obj/structure/chair/handrail{ + dir = 1 }, -/obj/item/paper_bin{ - pixel_x = 9 +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = -32 }, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/recharger, +/turf/open/floor/plasteel/white, +/area/ship/hallway/central) +"zn" = ( /obj/machinery/light/small/directional/south, /obj/machinery/firealarm/directional/east, -/turf/open/floor/carpet/cyan, +/obj/machinery/modular_computer/console/preset/command{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "zo" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1284,7 +1419,8 @@ /obj/machinery/door/airlock/medical/glass{ dir = 8; id_tag = "lobbydoors"; - name = "Sickbay" + name = "Sickbay"; + req_ship_access = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1292,25 +1428,31 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/white/mono, +/obj/effect/turf_decal/corner/opaque/cybersunteal{ + dir = 10 + }, /turf/open/floor/plasteel/white, -/area/ship/cargo) +/area/ship/crew/office/lobby) "zy" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "zD" = ( -/obj/effect/turf_decal/arrows/red{ - dir = 1 +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" }, /obj/effect/turf_decal/spline/fancy/opaque/black, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, +/area/ship/cargo) "zK" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -1329,28 +1471,25 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "zL" = ( -/obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/item/pen/fourcolor, -/obj/machinery/button/door{ - dir = 8; - id = "traumawindows"; - name = "Window Shutters"; - pixel_x = 5; - pixel_y = 7 +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking... snake bed? There's bits of shed scales stuck in the bedding..."; + name = "snake bed" }, -/obj/machinery/button/door{ +/mob/living/simple_animal/hostile/retaliate/poison/snake{ + desc = "A red, slithery snake. The question of what species it actually belongs to is a mystery for the ages."; dir = 8; - id = "traumabridge"; - name = "Bridge Window Shutters"; - pixel_x = -5; - pixel_y = 7 + name = "\proper Deuce"; + icon = 'icons/mob/pets.dmi'; + icon_dead = "bookworm_dead"; + icon_living = "bookworm"; + icon_state = "bookworm" }, -/obj/item/stamp/syndicate{ - pixel_x = -7; - pixel_y = -1 +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 8; + pixel_y = 19 }, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/white, /area/ship/bridge) "zM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1359,54 +1498,73 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ dir = 1 }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "zS" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 19 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "zT" = ( -/obj/effect/turf_decal/number/zero, -/turf/open/floor/plating, +/obj/effect/turf_decal/isf_small/right, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "Ah" = ( -/obj/item/radio/intercom/directional/west, -/turf/open/floor/carpet/cyan, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/closet/secure_closet/wall/directional/west{ + icon_state = "sec_wall"; + name = "captain's closet"; + req_access_txt = "20" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/cybersun, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/pen/edagger, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Ai" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 8 }, /obj/machinery/light/directional/south, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/storage) "Aj" = ( -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/structure/closet/secure_closet/wall/directional/south{ - icon_state = "sec_wall"; + icon_state = "solgov_wall"; name = "armor locker"; req_access_txt = "5" }, @@ -1417,24 +1575,34 @@ /obj/item/clothing/head/helmet/medical, /obj/item/clothing/head/helmet/medical, /obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/obj/effect/turf_decal/corner/opaque/cybersunteal{ + dir = 6 + }, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/crew) "Ap" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#FFFFFF" + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "AD" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Port Engines" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ @@ -1442,7 +1610,7 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) +/area/ship/crew/office/lobby) "AJ" = ( /turf/closed/wall/mineral/titanium, /area/ship/cargo) @@ -1456,7 +1624,7 @@ /obj/machinery/door/airlock/medical{ name = "Storage Room" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/tech/grid, @@ -1465,70 +1633,74 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/warning/corner, /obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 + dir = 1; + color = "#FFFFFF" }, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "Bp" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 5 - }, -/obj/machinery/cryopod{ +/obj/machinery/cryopod/syndicate{ dir = 1 }, /obj/machinery/computer/cryopod/directional/south, /obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/industrial/hatch{ + color = "#730622"; + alpha = 255 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 5; + color = "#FFFFFF" + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/crew) "BD" = ( -/obj/item/storage/belt/medical, -/obj/item/healthanalyzer/advanced, -/obj/item/hypospray/mkii/CMO, -/obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "solgov_wall"; - name = "chief medical officer's closet"; - req_access_txt = "40" +/obj/machinery/computer/security{ + dir = 1; + icon_keyboard = "syndie_key" }, -/obj/item/storage/backpack/satchel/med, -/obj/item/defibrillator/compact/loaded, -/obj/item/gun/syringe, -/obj/item/reagent_containers/glass/bottle/sodium_thiopental, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/gun/ballistic/automatic/pistol/ringneck, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/suit/toggle/labcoat/raincoat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/head/beret/cmo/cybersun, -/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun, -/turf/open/floor/carpet/cyan, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "BU" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed, /obj/item/clothing/mask/gas/sechailer, /obj/item/tank/internals/oxygen/red, +/obj/effect/turf_decal/box/white, +/obj/machinery/camera/autoname{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) +/area/ship/cargo) "Ca" = ( -/obj/machinery/computer/crew{ +/obj/machinery/computer/crew/syndie{ + icon_state = "computer-left"; dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Cp" = ( -/obj/machinery/door/airlock/medical{ - name = "Crew Quarters" +/obj/machinery/door/airlock/public{ + name = "Crew Quarters"; + req_ship_access = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ @@ -1540,17 +1712,14 @@ "Cy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/port) "CF" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; +/obj/machinery/door/window/brigdoor/westleft{ req_access_txt = "5" }, /obj/item/clothing/shoes/combat, @@ -1560,7 +1729,7 @@ dir = 5 }, /obj/structure/closet/secure_closet/wall/directional/south{ - icon_state = "sec_wall"; + icon_state = "solgov_wall"; name = "clothing locker"; req_access_txt = "5" }, @@ -1579,18 +1748,21 @@ /obj/item/clothing/under/syndicate/medic/skirt, /obj/item/clothing/under/syndicate/medic/skirt, /obj/item/clothing/under/syndicate/medic/skirt, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/crew) "CL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) "CZ" = ( /obj/machinery/door/poddoor/preopen{ dir = 8; @@ -1599,16 +1771,17 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/crew) "Dp" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/poddoor/preopen{ - dir = 8; +/obj/machinery/door/poddoor/shutters/preopen{ id = "traumasurgery"; - name = "Window Blast Door" + dir = 4 }, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/medical) "Dr" = ( @@ -1618,17 +1791,16 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "DS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1640,27 +1812,21 @@ pixel_y = -17; pixel_x = 11 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "DX" = ( -/obj/structure/closet/crate/medical, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/clothing/mask/breath/medical, -/obj/effect/turf_decal/industrial/outline/red, +/obj/structure/closet/crate/freezer/blood, /obj/machinery/iv_drip, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, /area/ship/storage) "Eb" = ( @@ -1668,79 +1834,112 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/industrial/warning, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/port) "Ev" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew) "EL" = ( -/obj/structure/bed{ - dir = 8 - }, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/cmo{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line, +/turf/open/floor/plasteel/white, +/area/ship/hallway/central) "ES" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/item/radio/intercom/wideband/directional/west, -/turf/open/floor/carpet/cyan, +/obj/machinery/button/door{ + dir = 4; + id = "traumawindows"; + name = "Window Shutters"; + pixel_x = -20; + pixel_y = -9 + }, +/obj/machinery/button/door{ + dir = 4; + id = "traumabridge"; + name = "Bridge Window Shutters"; + pixel_x = -20; + pixel_y = 2 + }, +/obj/machinery/newscaster/directional/west{ + pixel_y = 13 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "EW" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 1 }, +/obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical/surgery) "Fe" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed, /obj/item/clothing/mask/gas/sechailer, /obj/item/tank/internals/oxygen/red, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) +/area/ship/cargo) "Fr" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/poddoor/preopen{ - dir = 8; +/obj/machinery/door/poddoor/shutters/preopen{ id = "traumastore"; - name = "Window Blast Door" + dir = 4 }, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/storage) +"Ft" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/cybersunteal/mono, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "FE" = ( /obj/effect/landmark/start/paramedic, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( /obj/structure/chair{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "FO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/turf/open/floor/carpet/cyan, +/obj/structure/railing, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Gj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1749,29 +1948,29 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) "Gr" = ( -/obj/effect/turf_decal/corner/opaque/red/full, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/cybersunteal/half{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "Gs" = ( -/obj/structure/table, +/obj/structure/table/chem{ + name = "kitchen counter" + }, /obj/machinery/microwave{ pixel_y = 5 }, /obj/machinery/newscaster/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#332521" - }, -/turf/open/floor/wood/ebony, +/turf/open/floor/plasteel/dark, /area/ship/crew) "Gw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1780,13 +1979,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/airlock/medical/glass{ dir = 8; id_tag = "lobbydoors"; - name = "Sickbay" + name = "Sickbay"; + req_ship_access = 0 }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1794,30 +1994,33 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/white/mono, /turf/open/floor/plasteel/white, -/area/ship/cargo) +/area/ship/crew/office/lobby) "GH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Medical" +/obj/structure/chair/office/dark{ + dir = 4 }, /obj/effect/landmark/start/chief_medical_officer, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/white, /area/ship/bridge) "GI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "GK" = ( -/obj/structure/chair, +/obj/structure/chair/bench/grey/directional/south, /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "GZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/spline/fancy/opaque/black{ @@ -1827,7 +2030,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plasteel/patterned/brushed, @@ -1835,7 +2038,7 @@ "Hb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor/border_only{ @@ -1848,79 +2051,66 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/port) "Hk" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/structure/crate_shelf, /obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) +/area/ship/cargo) "Hl" = ( -/obj/structure/sign/poster/contraband/random, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew) +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/hallway/central) "HE" = ( /obj/structure/rack, -/obj/effect/turf_decal/industrial/outline/red, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, /obj/item/radio/intercom/directional/west, /obj/item/multitool, /obj/machinery/iv_drip, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/glass/five, +/obj/item/stack/sheet/plastic/five, +/obj/item/stack/sheet/plastic/five, +/obj/item/stack/sheet/plastic/five, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) +/area/ship/cargo) "HI" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/southleft{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 4; - id = "lobbydoors"; - name = "Lobby Door Control"; - normaldoorcontrol = 1; - pixel_x = 6; - pixel_y = -4 - }, +/obj/machinery/door/window/westleft, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/industrial/hatch/red, -/obj/machinery/button/shieldwallgen{ - dir = 4; - id = "traumashield"; - name = "Lobby Holoshield"; - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/button/door{ - dir = 4; - id = "lobbydoors"; - name = "Lobby Door Bolts Control"; - normaldoorcontrol = 1; - pixel_x = 6; - pixel_y = 8; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - dir = 4; - id = "traumalobby"; - name = "Lobby Shutter Control"; - pixel_x = -6; - pixel_y = -4 +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal/corner, +/obj/item/paper_bin{ + pixel_y = 15; + pixel_x = -2 }, -/turf/open/floor/plating, -/area/ship/cargo) +/obj/item/pen, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office/lobby) "HR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "HU" = ( /obj/structure/sign/departments/medbay/alt, @@ -1930,16 +2120,14 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/landmark/start/assistant, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#332521" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/wood/ebony, +/turf/open/floor/plasteel/dark, /area/ship/crew) "Jh" = ( /obj/machinery/door/poddoor/preopen{ @@ -1948,6 +2136,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/medical/surgery) "Jw" = ( @@ -1970,38 +2159,38 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "JA" = ( -/obj/machinery/power/smes/engineering{ - charge = 1e+006 +/obj/structure/reagent_dispensers/watertank, +/obj/item/mop, +/obj/item/pushbroom, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/bag/trash, +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "JC" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 8; id = "traumashield2" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/door/poddoor{ id = "traumaramp" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/engine, -/area/ship/storage/eva) +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "JQ" = ( -/obj/structure/sign/warning/gasmask{ - pixel_y = 32 - }, /obj/item/stack/marker_beacon/thirty, /obj/item/stack/marker_beacon/thirty, /obj/item/stack/marker_beacon/thirty, @@ -2019,16 +2208,14 @@ desc = "For extracting yourself from rough landings, and getting to the even rougher ones"; name = "Medical Retrieval Tool" }, -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "Kc" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew) "Ki" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/vending/medical, /turf/open/floor/plasteel/tech, /area/ship/storage) @@ -2036,66 +2223,62 @@ /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/industrial/warning{ - dir = 9 + dir = 9; + color = "#FFFFFF" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "Kp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/effect/turf_decal/industrial/warning{ - dir = 8 + dir = 10; + color = "#FFFFFF" }, /obj/machinery/button/door{ id = "traumaenginer"; name = "Engine Shutter Control"; pixel_x = -5; - pixel_y = -18; + pixel_y = -20; dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "Kv" = ( -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "medical intern's locker" - }, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, /obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#332521" +/obj/effect/turf_decal/box/white, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 19 }, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/under/syndicate/cybersun, -/turf/open/floor/wood/ebony, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/structure/closet/crate/freezer{ + name = "fridge"; + anchored = 1 + }, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/turf/open/floor/plasteel/dark, /area/ship/crew) "KB" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -2103,93 +2286,133 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/central) "KS" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable/yellow{ +/obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, /obj/item/stack/sheet/mineral/plasma/twenty, /turf/open/floor/plating, /area/ship/maintenance/port) "KU" = ( -/obj/structure/bed{ +/obj/structure/dresser{ dir = 8 }, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/blue{ - dir = 8 +/obj/effect/spawner/random/entertainment/plushie/moth{ + pixel_y = 11 + }, +/obj/structure/sign/poster/contraband/stechkin{ + pixel_x = 32 }, -/turf/open/floor/carpet/cyan, +/turf/open/floor/carpet/nanoweave, /area/ship/crew) "KW" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/cargo) +/area/ship/crew/office/lobby) "KZ" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/effect/turf_decal/industrial/hatch/red, /obj/structure/sign/warning/nosmoking{ pixel_x = 32 }, /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed, /obj/item/clothing/mask/gas/sechailer, /obj/item/tank/internals/oxygen/red, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) -"Le" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ +/area/ship/cargo) +"La" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 8 + }, +/obj/machinery/camera/autoname{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/hallway/central) +"Le" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 4 + }, +/obj/machinery/camera/autoname, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Lh" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Ln" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "Lr" = ( -/obj/machinery/modular_computer/console/preset/command, +/obj/structure/table/glass, /obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/cyan, +/obj/item/radio/intercom/wideband/table{ + dir = 1; + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/stamp/cybersun/biodynamics{ + pixel_y = 12; + pixel_x = -10 + }, +/obj/item/folder/syndicate{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/item/binoculars{ + pixel_x = -9 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Ls" = ( /obj/structure/table/reinforced, @@ -2205,20 +2428,16 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/industrial/hatch/red, -/turf/open/floor/plating, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office/lobby) "LH" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/firedoor/border_only{ @@ -2227,15 +2446,18 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = 32 +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 1 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 19 }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "LJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/west, @@ -2244,74 +2466,101 @@ pixel_x = -20; pixel_y = -11 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "Mb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/closet/secure_closet/medical2, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/reagent_containers/glass/bottle/morphine, /obj/machinery/firealarm/directional/south, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning{ + dir = 2; + color = "#FFFFFF" + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "MW" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/curtain/cloth, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/medical) "Nn" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "Nz" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = 15 +/obj/structure/curtain/cloth{ + color = "#4C9C9C" }, -/obj/structure/curtain, -/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/window/reinforced/survival_pod, /obj/machinery/door/window/survival_pod{ dir = 8 }, -/obj/item/soap, -/turf/open/floor/plasteel/freezer, +/obj/structure/catwalk/over/plated_catwalk/white, +/obj/machinery/shower{ + pixel_y = 16 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "Of" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-5" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-9" }, -/turf/open/floor/plasteel/stairs/mid{ - dir = 1 +/turf/open/floor/plasteel/stairs/right{ + dir = 1; + color = "#777777" }, -/area/ship/storage/eva) +/area/ship/cargo) "OF" = ( -/obj/effect/landmark/start/paramedic, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/closet/wall/directional/north{ + name = "Intern Closet" }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 22 +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/under/syndicate/cybersun, +/obj/item/clothing/under/syndicate/cybersun, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/crew) "OK" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -2323,14 +2572,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2341,8 +2584,8 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/central) "OZ" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage/eva) +/turf/closed/wall/mineral/titanium, +/area/ship/crew/office/lobby) "Pg" = ( /obj/structure/table/glass, /obj/item/clothing/mask/surgical{ @@ -2360,10 +2603,13 @@ }, /obj/item/reagent_containers/medigel/sterilizine, /obj/machinery/light/directional/south, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/medical/surgery) "Pm" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2372,15 +2618,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 4 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_y = 19; + layer = 4.26 }, +/obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Pp" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; +/obj/machinery/door/window/brigdoor/westright{ req_access_txt = "5" }, /obj/item/storage/belt/medical/surgery, @@ -2392,7 +2641,7 @@ dir = 10 }, /obj/structure/closet/secure_closet/wall/directional/north{ - icon_state = "sec_wall"; + icon_state = "solgov_wall"; name = "equipment locker"; req_access_txt = "5" }, @@ -2406,15 +2655,22 @@ /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/gloves/color/latex/nitrile/evil, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 1 + }, +/obj/item/attachment/rail_light, +/obj/item/attachment/rail_light, +/obj/item/attachment/rail_light, +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, /area/ship/crew) "Pz" = ( +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/tank/air{ - piping_layer = 2; - dir = 8 + dir = 8; + piping_layer = 2 }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/ship/maintenance/port) "PF" = ( @@ -2433,35 +2689,39 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/crew) "Qq" = ( /turf/closed/wall/mineral/titanium, /area/ship/medical) "Qw" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-6" }, /obj/machinery/button/door{ dir = 4; id = "traumaramp"; name = "Emergency Ramp"; - pixel_x = -26; + pixel_x = -20; pixel_y = -4 }, /obj/machinery/button/shieldwallgen{ dir = 4; id = "traumashield2"; name = "Emergency Ramp Shield"; - pixel_x = -23; + pixel_x = -19; pixel_y = 6 }, -/obj/effect/turf_decal/arrows/red{ - dir = 1 +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" }, /obj/effect/turf_decal/spline/fancy/opaque/black, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" + }, +/area/ship/cargo) "QF" = ( /obj/structure/chair/office/light{ dir = 8 @@ -2469,8 +2729,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/carpet/cyan, -/area/ship/hallway/central) +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/office/lobby) "QG" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -2494,20 +2756,21 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/crew/office/lobby) "Rb" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, -/obj/effect/turf_decal/siding/white/corner{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{ dir = 8 }, -/obj/effect/turf_decal/siding/white/corner, -/obj/structure/cable{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner, +/obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2516,32 +2779,35 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "Rl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 8 }, -/obj/structure/cable{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 4 + }, +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/storage) "RA" = ( -/obj/structure/chair{ +/obj/structure/chair/bench/grey/directional/north, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 1 }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/crew/office/lobby) "Sy" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/item/storage/firstaid/brute, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/o2, @@ -2552,15 +2818,18 @@ /obj/item/storage/firstaid/regular, /obj/structure/closet/secure_closet{ icon_state = "med"; - name = "medicine locker" + name = "medicine locker"; + anchored = 1 }, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, /area/ship/storage) "SR" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, -/obj/structure/sign/poster/official/moth/epi{ - pixel_y = -32 +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner, +/obj/structure/chair/handrail{ + dir = 1 }, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Td" = ( @@ -2568,11 +2837,23 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) +"Tf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "Tg" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -2590,57 +2871,74 @@ pixel_x = 32 }, /obj/machinery/light/directional/south, -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) -"Tr" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/cybersunteal/three_quarters, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 10 }, +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) +"Tr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "TA" = ( -/obj/machinery/computer/cargo{ - dir = 8 +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-right" }, -/turf/open/floor/plasteel/dark, +/obj/structure/railing, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "TB" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "TH" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/tech, -/area/ship/storage/eva) +/area/ship/cargo) "TL" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/structure/closet/crate/bin, /obj/machinery/light/directional/north, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/west, @@ -2649,47 +2947,60 @@ pixel_x = -20; pixel_y = -11 }, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ + dir = 8 + }, +/obj/effect/spawner/random/maintenance, +/obj/item/reagent_containers/syringe/contraband, +/obj/item/reagent_containers/syringe/contraband, +/turf/open/floor/plasteel/white, /area/ship/medical) "TZ" = ( -/obj/structure/filingcabinet/medical, +/obj/structure/filingcabinet/medical{ + dir = 8; + icon_state = "widecabinet" + }, /obj/machinery/airalarm/directional/east, /obj/machinery/light/directional/north, -/turf/open/floor/carpet/cyan, -/area/ship/hallway/central) +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/obj/item/folder/white, +/obj/item/folder/white, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/office/lobby) "Uc" = ( /turf/closed/wall/mineral/titanium, /area/ship/storage) "Ug" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "Uh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Uu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/industrial/warning, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Uz" = ( -/obj/effect/turf_decal/siding/white/end{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2701,8 +3012,9 @@ pixel_x = -20; pixel_y = -11 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "UD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -2710,45 +3022,68 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/hallway/central) +/turf/open/floor/plasteel/white, +/area/ship/crew/office/lobby) "UG" = ( /turf/template_noop, /area/template_noop) "UH" = ( -/obj/machinery/power/smes/engineering{ - charge = 1e+006 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 }, -/obj/structure/cable{ +/obj/machinery/power/smes/engineering, +/obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plating, /area/ship/maintenance/port) "UK" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-10" }, -/obj/effect/turf_decal/arrows/red{ - dir = 1 +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 8 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 8 +/turf/open/floor/plasteel/patterned/grid{ + color = "#777777" }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/storage/eva) +/area/ship/cargo) "UN" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; - pixel_y = -11 + pixel_y = 13 + }, +/obj/structure/closet/secure_closet/wall/directional/west{ + icon_state = "sec_wall"; + name = "medical director's closet"; + req_access_txt = "40" + }, +/obj/item/storage/belt/medical, +/obj/item/healthanalyzer/advanced, +/obj/item/hypospray/mkii/CMO, +/obj/item/storage/backpack/satchel/med, +/obj/item/defibrillator/compact/loaded, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/clothing/suit/toggle/labcoat/raincoat, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/carpet/cyan, +/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun, +/obj/item/clothing/head/beret/cmo/cybersun, +/obj/item/pen/edagger, +/turf/open/floor/plasteel/white, /area/ship/bridge) "UO" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -2760,10 +3095,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ dir = 1 }, /turf/open/floor/plasteel/white, @@ -2772,13 +3110,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/effect/turf_decal/siding/white{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, -/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, /obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/obj/structure/chair/handrail{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "VJ" = ( /obj/machinery/door/poddoor/preopen{ id = "traumawindows"; @@ -2786,94 +3127,110 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/science) "VN" = ( /obj/machinery/light/small/directional/north, -/turf/open/floor/plating, +/obj/structure/closet/secure_closet/medical2, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + color = "#FFFFFF" + }, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "WB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/freezer, -/area/ship/crew/toilet) -"WJ" = ( -/obj/structure/bed{ - dir = 8 - }, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/syndie{ +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ dir = 8 }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/toilet) +"WJ" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/mono/white, +/area/ship/crew/office/lobby) "WP" = ( -/obj/effect/turf_decal/industrial/outline/red, /obj/structure/railing/corner{ dir = 8 }, /obj/machinery/airalarm/directional/east, /obj/structure/rack, /obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/plasmaman/full, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "WX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/spline/fancy/opaque/cybersunteal{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/storage) "Xd" = ( -/obj/item/areaeditor/shuttle, -/obj/item/megaphone/command, -/obj/item/clothing/glasses/sunglasses, -/obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "solgov_wall"; - name = "captain's closet"; - req_access_txt = "20" +/obj/machinery/airalarm/directional/north, +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 10 }, -/obj/item/gun/ballistic/revolver/viper, -/obj/item/clothing/suit/armor/vest/capcarapace/cybersun, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/reagent_containers/food/drinks/flask, -/obj/item/reagent_containers/food/drinks/bottle/gin, -/turf/open/floor/carpet/cyan, +/obj/item/paper_bin{ + pixel_y = 11; + pixel_x = 9 + }, +/obj/item/pen/fourcolor, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + pixel_y = 7; + pixel_x = -9 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/item/storage/secure/safe/cybersun/biodynamics{ + dir = 8; + pixel_x = -30; + pixel_y = -10 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "Xi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/structure/sign/poster/contraband/gec{ + pixel_x = 32 }, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Xu" = ( +/obj/structure/closet/firecloset/wall/directional/south, /obj/machinery/atmospherics/components/binary/pump/on/layer2{ dir = 8 }, -/obj/structure/closet/firecloset/wall/directional/south, /turf/open/floor/plating, /area/ship/maintenance/port) "Xx" = ( @@ -2886,43 +3243,53 @@ /turf/template_noop, /area/template_noop) "XL" = ( +/obj/item/radio/intercom/directional/north, /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable/yellow{ +/obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/item/wrench/crescent, -/obj/item/radio/intercom/directional/north, +/obj/item/storage/toolbox/syndicate{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/structure/rack, /turf/open/floor/plating, /area/ship/maintenance/port) +"XN" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew) "Ym" = ( -/obj/machinery/holopad/emergency/command, +/obj/machinery/holopad/secure, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/carpet/cyan, +/turf/open/floor/plasteel/white, /area/ship/bridge) "Yn" = ( -/obj/structure/curtain/cloth{ - color = "#ACD1E9" - }, /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "traumabridge"; + dir = 4 + }, /turf/open/floor/plating, /area/ship/bridge) "Yw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/item/storage/toolbox/electrical, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/open/floor/plating, @@ -2934,33 +3301,39 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) "YQ" = ( -/obj/effect/turf_decal/number/five, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 22 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/open/floor/plating, +/obj/effect/turf_decal/isf_small, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "YV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/white/end, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/eva) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/cargo) "Zv" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/curtain/cloth, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "traumastore"; + dir = 2 + }, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/storage) "ZC" = ( @@ -2969,26 +3342,34 @@ "ZH" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/line{ dir = 1 }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) "ZJ" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/opaque/cybersunteal/corner{ + dir = 2 + }, /turf/open/floor/plasteel/white, /area/ship/hallway/central) @@ -3023,13 +3404,13 @@ fp UG UG UG -AJ +OZ KW yn sC rA KW -AJ +OZ UG UG UG @@ -3046,13 +3427,13 @@ ZC UG UG UG -gL +an fX bv Ap bv na -gL +an UG UG UG @@ -3069,13 +3450,13 @@ ZC UG UG fp -gL +an GK -eS +WJ oc eS RA -gL +an Ti UG UG @@ -3092,13 +3473,13 @@ ZC ZC ZC ZC -gL +an lS yX -oc +Ft Gr lX -gL +an UO UO UO @@ -3116,7 +3497,7 @@ Cy cK Eb AD -GI +Tf Td pQ rn @@ -3138,13 +3519,13 @@ ZC ZC ZC tI -gL +an xB uE uE oA lJ -gL +an UO UO UO @@ -3158,19 +3539,19 @@ ZC XL Yw bz -fp +ZC UG vx -gL +an Ls HI cL Gw zq -gL -UG +an +ke UG -Ti +UO VN zT kh @@ -3258,7 +3639,7 @@ sO YA xp gW -ke +qA rk eT qA @@ -3303,8 +3684,8 @@ hQ Pg YA zM -gW -ke +La +qA wp mx qA @@ -3349,7 +3730,7 @@ FH tT MW UV -gW +EL Zv Sy DX @@ -3372,7 +3753,7 @@ fW tF nI Lh -zy +tn AQ WX Rl @@ -3395,7 +3776,7 @@ vn bT MW UV -gW +EL Zv Ki tJ @@ -3409,14 +3790,14 @@ UG (19,1,1) = {" UG UG -tn -OZ -OZ -OZ -OZ -OZ -OZ -OZ +AJ +gL +gL +gL +gL +gL +gL +gL LH zl Ev @@ -3424,10 +3805,10 @@ Ev Ev Ev Ev +Ev iA UG UG -UG "} (20,1,1) = {" UG @@ -3439,7 +3820,7 @@ Uz Hk HE TH -OZ +gL bQ ZJ Ev @@ -3448,7 +3829,7 @@ iC jh Gs Ev -iA +Ev UG UG "} @@ -3464,7 +3845,7 @@ Ln YV uU iQ -zy +tn Cp uc IL @@ -3485,13 +3866,13 @@ UX BU KZ Fe -OZ +gL TB us Ev OF yf -iW +XN nF iW PH @@ -3501,7 +3882,7 @@ UG (23,1,1) = {" UG UG -OZ +gL JQ WP zo @@ -3524,9 +3905,9 @@ UG (24,1,1) = {" UG UG -tn -OZ -OZ +AJ +gL +gL zo wr WB @@ -3538,7 +3919,7 @@ Ev Pp CF Ev -Hl +Ev CZ iA UG @@ -3549,14 +3930,14 @@ UG UG UG UG -tn +AJ zo Nz rS ba zo Tr -gW +Hl Ev vj Aj @@ -3597,7 +3978,7 @@ UG UG UG Nn -WJ +Nn Xd Ah ES @@ -3605,7 +3986,7 @@ Ym Uh UN BD -EL +Nn Nn UG UG diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm index a2ec15e5022f..afbdc5248c4d 100644 --- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm +++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm @@ -144,6 +144,7 @@ TURF_DECAL_COLOR_HELPER(opaque/solgovblue, "#2d2a4e", 255) TURF_DECAL_COLOR_HELPER(opaque/solgovgold, "#eeac2e", 255) TURF_DECAL_COLOR_HELPER(opaque/syndiered, "#730622", 255) TURF_DECAL_COLOR_HELPER(opaque/inteqbrown, "#4b2a18", 255) +TURF_DECAL_COLOR_HELPER(opaque/cybersunteal, "#4C9C9C", 255) //transparent TURF_DECAL_COLOR_HELPER(transparent/neutral, null, 75) @@ -171,6 +172,7 @@ TURF_DECAL_COLOR_HELPER(transparent/solgovblue, "#2d2a4e", 140) TURF_DECAL_COLOR_HELPER(transparent/solgovgold, "#eeac2e", 140) TURF_DECAL_COLOR_HELPER(transparent/syndiered, "#730622", 140) TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140) +TURF_DECAL_COLOR_HELPER(transparent/cybersunteal, "#4C9C9C", 140) /obj/effect/turf_decal/spline/plain icon_state = "spline_plain" diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index c386e5808c5d..57f6f70e32b7 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -66,6 +66,14 @@ gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck +/obj/item/storage/guncase/pistol/pc76 + gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck + mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck + +/obj/item/storage/guncase/pistol/rattlesnake + gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake + mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake + /obj/item/storage/guncase/cobra gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie mag_type = /obj/item/ammo_box/magazine/m45_cobra diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 70251b3c7701..862e558ab1e1 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -281,6 +281,9 @@ NO_MAG_GUN_HELPER(automatic/pistol/rattlesnake) . = ..() icon_state = "[base_icon_state]_[ammo_count() == 1 ? 1 : round(ammo_count(),3)]" +/obj/item/ammo_box/magazine/m9mm_rattlesnake/empty + start_empty = TRUE + /obj/item/gun/ballistic/automatic/pistol/himehabu name = "PC-81 \"Himehabu\"" desc = "An astonishingly compact machine pistol firing ultra-light projectiles, designed to be as small and concealable as possible while remaining a credible threat at very close range. Armor penetration is practically non-existent. Chambered in .22."