diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 192905d0a4518..8889386b61e78 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -705,20 +705,11 @@ }, /area/hallway/secondary/entry) "aeX" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/closed/wall/r_wall, +/area/security/brig) "afb" = ( /obj/effect/spawner/randomvend/snack, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -2013,9 +2004,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "apC" = ( -/obj/machinery/light/small{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -2495,12 +2483,12 @@ /area/maintenance/starboard/fore) "asd" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/disposal) -"ase" = ( /obj/machinery/light/small{ dir = 8 }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"ase" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3780,9 +3768,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 1 +/obj/structure/disposalpipe/sorting/mail/destination/disposals{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -4477,12 +4464,10 @@ /area/maintenance/port/fore) "aBB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Custodial Junction"; - sortType = 22 - }, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/sorting/mail/destination/janitor_closet{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "aBC" = ( @@ -4928,10 +4913,6 @@ /obj/machinery/computer/cargo{ dir = 8 }, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo Bay - Starboard"; - name = "cargo camera" - }, /obj/effect/turf_decal/bot, /obj/machinery/light{ dir = 4 @@ -5034,6 +5015,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aEt" = ( @@ -5721,6 +5708,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "aJk" = ( @@ -6129,9 +6119,6 @@ /area/quartermaster/sorting) "aLY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/conveyor/inverted{ dir = 10; id = "cargoload" @@ -6889,18 +6876,13 @@ /turf/open/floor/iron, /area/engine/atmos) "aRB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/camera/autoname/directional/east, /obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 4 }, /turf/open/floor/iron, -/area/engine/atmos) +/area/crew_quarters/fitness/recreation) "aRE" = ( /obj/structure/lattice, /turf/open/space, @@ -9246,12 +9228,10 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "biX" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bjh" = ( @@ -9447,9 +9427,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, @@ -9458,7 +9435,7 @@ "bkL" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -10970,16 +10947,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 23 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/genetics{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/central) "bsW" = ( @@ -14502,10 +14478,6 @@ pixel_x = -1; pixel_y = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/paper/fluff/jobs/medical/hippocratic, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) @@ -16107,9 +16079,6 @@ /obj/item/clothing/mask/cigarette/cigar, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/reagent_containers/food/drinks/flask/det, -/obj/machinery/camera/directional/west{ - c_tag = "Detective's Office" - }, /turf/open/floor/carpet/red, /area/security/detectives_office) "ceQ" = ( @@ -17129,16 +17098,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "cld" = ( @@ -17468,11 +17436,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 29 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/sorting/mail/destination/law_office{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cne" = ( @@ -20475,17 +20442,13 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "cCq" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/lattice, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Head of Security's Office"; + network = list("ss13","security") }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +/turf/open/space, +/area/space/nearstation) "cCr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -22492,12 +22455,12 @@ pixel_x = -26; pixel_y = -26 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "cMG" = ( @@ -22864,10 +22827,6 @@ /obj/machinery/gulag_item_reclaimer{ pixel_y = 24 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","security") - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -23208,6 +23167,10 @@ /obj/item/radio/intercom{ pixel_x = 26 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron, /area/science/xenobiology) "cRW" = ( @@ -23747,9 +23710,6 @@ dir = 4 }, /obj/effect/landmark/start/assistant, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -24115,10 +24075,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","medbay") - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -24138,6 +24094,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "cYB" = ( @@ -24388,7 +24347,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/bin, +/obj/structure/disposaloutlet, /turf/open/floor/iron, /area/science/xenobiology) "dav" = ( @@ -24592,7 +24551,6 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt, -/obj/structure/rack, /obj/item/wrench, /obj/item/rollerbed, /turf/open/floor/plating, @@ -24628,9 +24586,6 @@ /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -25433,10 +25388,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","prison") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/prison, /area/security/prison) "die" = ( @@ -25623,21 +25575,19 @@ /turf/open/floor/iron/white, /area/science/research) "djM" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 24 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "djO" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 25 - }, /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/sorting/mail/destination/toxins{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "djS" = ( @@ -25937,7 +25887,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/research) "dmN" = ( @@ -28411,6 +28363,10 @@ /area/science/robotics/lab) "dGo" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "dGA" = ( @@ -29227,7 +29183,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/preset/toxins{ - dir = 4 + dir = 8 }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -30059,6 +30015,10 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "dSh" = ( @@ -30221,10 +30181,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/desk_bell{ pixel_x = 5; pixel_y = -1 @@ -30480,12 +30436,19 @@ /turf/open/floor/iron/checker, /area/engine/atmos) "dWg" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/security/brig) "dWv" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -31748,6 +31711,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ehA" = ( @@ -31832,22 +31799,12 @@ /area/security/checkpoint/customs/auxiliary) "eiw" = ( /obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Fore Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 + dir = 1; + layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/camera/directional/south, +/turf/open/space, +/area/space/nearstation) "eiz" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31962,9 +31919,6 @@ /turf/closed/wall, /area/medical/medbay/aft) "ekb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -32820,6 +32774,7 @@ pixel_x = -31; pixel_y = -3 }, +/obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/security/checkpoint/medical) "ewt" = ( @@ -33234,9 +33189,6 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "eBr" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -33244,6 +33196,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/science/nanite) "eCe" = ( @@ -33279,6 +33234,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) +"eCm" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/turf/open/space, +/area/space/nearstation) "eCn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -33544,10 +33506,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/camera{ - c_tag = "Security - Medbay"; - dir = 5 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/item/radio/intercom{ @@ -33696,12 +33654,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34620,14 +34572,12 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "eYT" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "HoS Junction"; - sortType = 8 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/hos_office{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "eYY" = ( @@ -35525,6 +35475,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "fll" = ( @@ -36155,10 +36108,6 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/clipboard{ pixel_x = -4; pixel_y = 2 @@ -36256,15 +36205,13 @@ /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) "fAF" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/machinery/camera/directional/west{ - c_tag = "Recreation - Center"; - name = "recreation camera" +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron{ + heat_capacity = 1e+006 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "fAO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36815,13 +36762,12 @@ /turf/open/floor/iron, /area/engine/atmos) "fKY" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 28 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ + dir = 8 + }, /turf/open/floor/iron, /area/science/research) "fLo" = ( @@ -39527,15 +39473,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "gze" = ( @@ -39771,7 +39717,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/sorting/unsorted{ dir = 4 }, /turf/open/floor/iron, @@ -39892,10 +39838,8 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "RD's Junction"; - sortType = 13 +/obj/structure/disposalpipe/sorting/mail/destination/rd_office{ + dir = 2 }, /turf/open/floor/iron/white, /area/science/research) @@ -40471,9 +40415,6 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "gPb" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -42940,6 +42881,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/medical/patients_rooms) "hEk" = ( @@ -43958,10 +43900,8 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Research Junction"; - sortType = 12 +/obj/structure/disposalpipe/sorting/mail/destination/research{ + dir = 1 }, /turf/open/floor/iron, /area/science/research) @@ -44476,9 +44416,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - name = "Atmospherics Junction"; - sortType = 6; +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics{ dir = 8 }, /turf/open/floor/iron, @@ -44584,6 +44522,9 @@ /area/engine/atmos) "iaF" = ( /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "iaQ" = ( @@ -45113,10 +45054,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Security Junction"; - sortType = 7 +/obj/structure/disposalpipe/sorting/mail/destination/security{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -45238,6 +45177,10 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "ikW" = ( @@ -45661,10 +45604,6 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/item/folder/white{ pixel_x = -5; pixel_y = 3 @@ -46214,10 +46153,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","prison") - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/prison, /area/security/prison) "iBI" = ( @@ -46351,6 +46287,16 @@ /area/crew_quarters/kitchen) "iEe" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "iEp" = ( @@ -46452,10 +46398,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ pixel_y = 32 }, @@ -47040,16 +46982,15 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "iSf" = ( -/obj/machinery/light, -/obj/machinery/camera/directional/south{ - c_tag = "Recreation - Aft"; - name = "recreation camera" +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, /turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +/area/security/brig) "iSq" = ( /obj/structure/cable{ icon_state = "0-2" @@ -47395,9 +47336,6 @@ /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "iZX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -47407,11 +47345,8 @@ network = list("minisat"); start_active = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/turf/open/space, +/area/space/nearstation) "jaj" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -47720,22 +47655,20 @@ /turf/open/floor/iron, /area/engine/atmos) "jfy" = ( -/obj/structure/window/reinforced, -/obj/machinery/camera/directional/south{ - c_tag = "AI Satellite - Fore"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/pool{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "jfE" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/iv_drip, @@ -48365,10 +48298,6 @@ /turf/open/floor/plating, /area/quartermaster/qm) "jqk" = ( -/obj/structure/disposalpipe/sorting/mail{ - name = "Chapel Junction"; - sortType = 17 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -48376,6 +48305,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/chapel, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jqq" = ( @@ -49664,10 +49594,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, /turf/open/floor/iron/dark/smooth_corner{ dir = 4 }, @@ -52159,12 +52085,10 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "kAZ" = ( @@ -52463,7 +52387,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "kFT" = ( -/obj/machinery/light, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52506,6 +52429,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/medical/morgue) "kGh" = ( @@ -52876,25 +52800,23 @@ /area/maintenance/disposal/incinerator) "kNE" = ( /obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 30 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/sorting/mail/destination/detective_office{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "kNI" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 27 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/destination/virology{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/aft) "kOn" = ( @@ -53868,11 +53790,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "Bar Junction"; - sortType = 19 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -53880,6 +53797,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "lhu" = ( @@ -53912,6 +53832,10 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "lif" = ( @@ -55603,11 +55527,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Theatre Junction"; - sortType = 18 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -55615,6 +55534,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/threatre/flip, /turf/open/floor/iron, /area/maintenance/port/fore) "lJV" = ( @@ -56751,6 +56671,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) "mck" = ( @@ -56864,16 +56785,14 @@ /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "meF" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/item/kirbyplants{ - icon_state = "plant-22"; - name = "legally obbligatory mapper potted plant" +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/crew_quarters/fitness/recreation) "meG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -57642,10 +57561,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window/reinforced, @@ -58125,10 +58040,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -60046,6 +59957,7 @@ /obj/structure/chair{ dir = 1 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/medical/surgery) "neH" = ( @@ -60240,9 +60152,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nhm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -60256,6 +60165,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/science/nanite) "nhn" = ( @@ -60582,6 +60494,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "nmn" = ( @@ -60645,10 +60560,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","security") - }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "nmW" = ( @@ -60818,10 +60729,6 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","medbay") - }, /turf/open/floor/iron, /area/medical/patients_rooms) "npA" = ( @@ -62274,6 +62181,21 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) +"nKQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "nLk" = ( /obj/structure/chair/stool/bar, /obj/structure/disposalpipe/segment{ @@ -62450,12 +62372,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - name = "Kitchen Junction"; - sortType = 20 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/kitchen/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "nOt" = ( @@ -62989,6 +62909,12 @@ /obj/machinery/light_switch{ pixel_x = 22 }, +/obj/machinery/camera/directional/east{ + c_tag = "AI Satellite - Port"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, /turf/open/floor/iron/dark, /area/aisat) "nWU" = ( @@ -64193,17 +64119,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "osG" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/table, /obj/item/clipboard, /obj/item/folder/white, /obj/item/pen, -/obj/machinery/camera/directional/north{ - c_tag = "Recreation - Fore"; - name = "recreation camera" - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -64576,10 +64495,7 @@ pixel_x = -26; pixel_y = 1 }, -/obj/machinery/camera/autoname{ - network = list("ss13","security"); - dir = 10 - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -65027,10 +64943,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - name = "CE's Junction"; - sortType = 5 - }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office, /turf/open/floor/iron, /area/engine/break_room) "oGs" = ( @@ -65498,13 +65411,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/medbay{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "oPi" = ( @@ -66893,6 +66805,7 @@ /turf/open/floor/iron/dark, /area/library) "pnP" = ( +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/security/main) "pnV" = ( @@ -67295,6 +67208,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "pvd" = ( @@ -67693,6 +67609,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white, /area/security/brig/medbay) "pDc" = ( @@ -68345,15 +68262,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, /obj/effect/turf_decal/pool{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "pMI" = ( @@ -68528,10 +68445,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Quartermaster Junction"; - sortType = 3 +/obj/structure/disposalpipe/sorting/mail/destination/qm_office{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -70897,6 +70812,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/research) "qCL" = ( @@ -72456,10 +72374,7 @@ /area/maintenance/port/aft) "rbB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","medbay") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/medical/genetics/cloning) "rbE" = ( @@ -73040,23 +72955,9 @@ /turf/open/floor/plating, /area/maintenance/port) "rjz" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Aft Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) "rjB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73255,11 +73156,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "Hydroponics Junction"; - sortType = 21 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -73270,6 +73166,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/hydroponics/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "rnd" = ( @@ -73465,9 +73364,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -73559,6 +73455,13 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"rrk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/nanite) "rrl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74484,6 +74387,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/science/nanite) "rHf" = ( @@ -74653,9 +74559,6 @@ /area/engine/engineering) "rJs" = ( /obj/structure/closet/athletic_mixed, -/obj/machinery/light/small{ - dir = 4 - }, /obj/item/pool/pool_noodle, /obj/item/pool/pool_noodle, /obj/item/pool/rubber_ring, @@ -75162,6 +75065,13 @@ }, /turf/open/floor/iron, /area/engine/storage_shared) +"rQM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "rRd" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -75207,15 +75117,13 @@ id = "bridgedoors"; name = "Bridge Access Blast door" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "HoP Junction"; - sortType = 15 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/hop_office{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/bridge) "rSZ" = ( @@ -75307,8 +75215,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/xenobiology) "rTH" = ( @@ -75440,6 +75350,9 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "rVT" = ( @@ -75542,10 +75455,10 @@ /area/science/lab) "rXz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/science/xenobiology) "rXE" = ( @@ -76007,14 +75920,14 @@ /turf/open/floor/iron, /area/security/brig) "see" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "sef" = ( @@ -76469,6 +76382,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) "smd" = ( @@ -76948,14 +76862,12 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "stM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/tcommsat/server) +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/quartermaster/storage) "stS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77009,8 +76921,8 @@ dir = 9 }, /obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -77762,10 +77674,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -77796,6 +77705,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "sHi" = ( @@ -79264,10 +79177,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Head of Security's Quarters"; - network = list("ss13","security") - }, /turf/open/floor/iron, /area/crew_quarters/heads/hos) "tep" = ( @@ -79561,14 +79470,12 @@ /turf/open/floor/iron, /area/quartermaster/qm) "tkd" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/tcommsat/server) +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "tkj" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -79711,9 +79618,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 11 +/obj/structure/disposalpipe/sorting/mail/destination/chemistry{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -80836,23 +80742,12 @@ /turf/open/floor/iron/dark, /area/maintenance/department/medical/morgue) "tBX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Fore Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engine/atmos) "tCb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -82730,6 +82625,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ujf" = ( @@ -83490,6 +83389,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/security/checkpoint/medical) "uvs" = ( @@ -83880,6 +83783,13 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "uEb" = ( @@ -85490,6 +85400,7 @@ c_tag = "Cargo Bay - Aft Starboard"; name = "cargo camera" }, +/obj/machinery/light, /turf/open/floor/iron, /area/quartermaster/storage) "veA" = ( @@ -85609,6 +85520,9 @@ "vgu" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/nanite) "vgB" = ( @@ -86479,6 +86393,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "vuq" = ( @@ -87649,9 +87570,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, @@ -88152,13 +88070,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "Library Junction"; - sortType = 16 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/library/flip{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "vVL" = ( @@ -88424,23 +88340,11 @@ /turf/open/floor/iron/white, /area/medical/genetics) "vZk" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Aft Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/structure/window/reinforced, +/obj/structure/lattice, +/obj/machinery/camera/directional/north, +/turf/open/space, +/area/space/nearstation) "vZo" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 @@ -89216,9 +89120,12 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "wlf" = ( -/obj/machinery/light/small, -/turf/open/floor/iron/smooth, -/area/tcommsat/server) +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "wlp" = ( /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 8 @@ -89379,12 +89286,8 @@ dir = 1; pixel_y = -26 }, -/obj/machinery/camera{ - c_tag = "Courtroom - Fore"; - dir = 5; - network = list("ss13","security") - }, /obj/structure/fluff/hedge, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, @@ -89448,15 +89351,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/sorting/mail{ - name = "Engineering Junction"; - sortType = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/engineering, /turf/open/floor/iron, /area/engine/engineering) "woe" = ( @@ -90799,10 +90699,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -91496,6 +91392,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "wRi" = ( @@ -93110,9 +93009,6 @@ /area/ai_monitored/turret_protected/ai) "xtq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/delivery, /obj/item/kirbyplants{ icon_state = "plant-22"; @@ -93764,10 +93660,6 @@ /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "xDV" = ( @@ -93797,13 +93689,10 @@ name = "old sink"; pixel_y = 28 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","security") - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/security/main) "xDX" = ( @@ -93816,10 +93705,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Cargo Junction"; - sortType = 2 +/obj/structure/disposalpipe/sorting/mail/destination/cargo_bay{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -93959,12 +93846,10 @@ /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) "xHF" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Robotics Junction"; - sortType = 14 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/robotics{ + dir = 1 + }, /turf/open/floor/iron, /area/science/research) "xHG" = ( @@ -94334,9 +94219,6 @@ /turf/open/floor/prison/dark, /area/security/prison) "xMT" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Security Post - Medbay" - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -94536,6 +94418,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "xPo" = ( @@ -94844,9 +94729,6 @@ "xTZ" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/camera/autoname{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -95396,10 +95278,6 @@ /area/janitor/custodian) "ybx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -101036,7 +100914,7 @@ bmD bpF bmD bpF -bmD +eCm bpF bmD bpF @@ -101291,7 +101169,7 @@ aad bkE ppV qfm -iZX +qfm qfm tCb kgc @@ -101795,7 +101673,7 @@ bmD bmD bpF bmD -bmD +eCm bpF bmD bmD @@ -102052,7 +101930,7 @@ uPJ uPJ uPJ uPJ -tBX +uPJ uPJ uPJ uPJ @@ -102329,7 +102207,7 @@ bPC bkE sqE bNB -bmD +eCm bpF bmD bmD @@ -102589,7 +102467,7 @@ uPJ uPJ uPJ uPJ -rjz +uPJ uPJ uPJ wGQ @@ -104137,7 +104015,7 @@ bkE vli suY lUu -brN +eiw wiQ aaa aaa @@ -104360,7 +104238,7 @@ aad bkE dpf obd -jfy +jQx brQ btH btH @@ -104614,7 +104492,7 @@ aaa aaa aaa wiQ -bkF +vZk dpf vFU xvN @@ -106187,7 +106065,7 @@ uPJ uPJ uPJ uPJ -vZk +uPJ uPJ uPJ cvA @@ -106444,7 +106322,7 @@ bNu bmH bpN bmH -bmH +iZX bpN bmH bmH @@ -106678,7 +106556,7 @@ uPJ uPJ uPJ uPJ -eiw +uPJ uPJ uPJ uPJ @@ -106938,7 +106816,7 @@ bmH bmH bpN bmH -bmH +iZX bpN bmH bpN @@ -119262,7 +119140,7 @@ bdd hvQ hvQ hvQ -hvQ +tBX bkL rZo bom @@ -119758,7 +119636,7 @@ nlZ nlZ vtt tde -aFr +rjz uIt gtJ aLm @@ -122335,7 +122213,7 @@ qje aRF wLp lwT -aRB +aRw rOx hoy gPR @@ -127037,7 +126915,7 @@ cMY dhU djK djK -dmF +rrk kkD dmF djF @@ -128203,7 +128081,7 @@ ads aaO aaO aaO -meF +gOs afw afT agk @@ -132058,7 +131936,7 @@ ads aaO cYD aaO -meF +gOs afw afT agk @@ -133086,7 +132964,7 @@ adq aaO enM aaO -aeX +agk afx afx gOs @@ -134706,11 +134584,11 @@ sQH bUI coe bUI -tkd +vCq hGZ qDD cSI -wlf +cSI bUI coe wwj @@ -135220,11 +135098,11 @@ sQH bUI bUI bUI -stM +qxk hEN qDD cSI -wlf +cSI bUI bUI hgU @@ -135804,7 +135682,7 @@ dST uus qCL dVl -dWg +dVl dVl dVl bLp @@ -135812,7 +135690,7 @@ dVl bLp dVl dVl -dWg +dVl dVl dVl bLp @@ -141080,7 +140958,7 @@ aoE pKM lkf aoF -sNU +stM ayB azE azE @@ -141857,7 +141735,7 @@ gcu nBv aCb hlZ -aEh +avW ldp aGD aHW @@ -145749,7 +145627,7 @@ fVL rob rob gdZ -gdZ +nKQ gPb gdZ gdZ @@ -145761,7 +145639,7 @@ tnr bgZ bgZ bgZ -bgZ +aeX bgZ jFJ pMO @@ -147557,7 +147435,7 @@ qZl kko taC pZK -sdY +iSf vSX oXU uzA @@ -147814,7 +147692,7 @@ eJa pne cLk uiv -uiv +dWg tJz mPI mIl @@ -149371,14 +149249,14 @@ cuL cwd qzt czg -cwd +tkd cCk cDJ cFC cwd cIk xLr -fAF +gsU cMF cYr cPX @@ -149386,7 +149264,7 @@ cRw cTd cVc xEx -cYr +rQM sTR dbF ddv @@ -149637,7 +149515,7 @@ sNq fDm phy pMF -sNq +jfy sNq qFm uxo @@ -150417,7 +150295,7 @@ sTP gsU pDo qwP -iSf +upD cuM aad cHU @@ -151427,22 +151305,22 @@ cuM twt twt twt -twt -cCq +meF +cFD cDO cFD cFD -twt +meF iLk nvA nvA dbJ -dbJ +wlf cRx cRx cVg cRx -dbJ +aRB dbJ dbJ ddy @@ -151675,7 +151553,7 @@ boa mgC ewo biP -aad +cCq aaa aaa aaa @@ -151683,8 +151561,8 @@ aaa cuM jQL jQL -jQL -cuM +fAF +cuL cuM cuM cuM @@ -151699,7 +151577,7 @@ cuM cuM cuM cuM -cuM +cuL daj dbK ddz diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 41b21e5989189..609e3d8328f0f 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -30,3 +30,160 @@ #define STATION_TUBE_OPENING 1 #define STATION_TUBE_CLOSED 2 #define STATION_TUBE_CLOSING 3 + +// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to +// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages +// tagged for the Cargo Bay. + +/* List of sortType codes for mapping reference +0 Waste +1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler. +2 Cargo Bay +3 QM Office +4 Engineering +5 CE Office +6 Atmospherics +7 Security +8 HoS Office +9 Medbay +10 CMO Office +11 Chemistry +12 Research +13 RD Office +14 Robotics +15 HoP Office +16 Library +17 Chapel +18 Theatre +19 Bar +20 Kitchen +21 Hydroponics +22 Janitor +23 Genetics +24 Testing Range +25 Toxins +26 Dormitories +27 Virology +28 Xenobiology +29 Law Office +30 Detective's Office +*/ + +//The whole system for the sorttype var is determined based on the order of this list, +//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude + +//If you don't want to fuck up disposals, add to this list, and don't change the order. +//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete + +GLOBAL_LIST_INIT(TAGGERLOCATIONS, list( + "Disposals", + "Cargo Bay", + "QM Office", + "Engineering", + "CE Office", + "Atmospherics", + "Security", + "HoS Office", + "Medbay", + "CMO Office", + "Chemistry", + "Research", + "RD Office", + "Robotics", + "HoP Office", + "Library", + "Chapel", + "Theatre", + "Bar", + "Kitchen", + "Hydroponics", + "Janitor Closet", + "Genetics", + "Testing Range", + "Toxins", + "Dormitories", + "Virology", + "Xenobiology", + "Law Office", + "Detective's Office", +)) + +#define MAPPING_HELPER_SORT(name, sort_code) /obj/structure/disposalpipe/sorting/mail/destination/##name {\ + sortType = sort_code;\ +}\ +/obj/structure/disposalpipe/sorting/mail/destination/##name/flip {\ + flip_type = /obj/structure/disposalpipe/sorting/mail;\ + icon_state = "pipe-j2s";\ + initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP;\ +} + +MAPPING_HELPER_SORT(disposals, 1) +MAPPING_HELPER_SORT(cargo_bay, 2) +MAPPING_HELPER_SORT(qm_office, 3) +MAPPING_HELPER_SORT(engineering, 4) +MAPPING_HELPER_SORT(ce_office, 5) +MAPPING_HELPER_SORT(atmospherics, 6) +MAPPING_HELPER_SORT(security, 7) +MAPPING_HELPER_SORT(hos_office, 8) +MAPPING_HELPER_SORT(medbay, 9) +MAPPING_HELPER_SORT(cmo_office, 10) +MAPPING_HELPER_SORT(chemistry, 11) +MAPPING_HELPER_SORT(research, 12) +MAPPING_HELPER_SORT(rd_office, 13) +MAPPING_HELPER_SORT(robotics, 14) +MAPPING_HELPER_SORT(hop_office, 15) +MAPPING_HELPER_SORT(library, 16) +MAPPING_HELPER_SORT(chapel, 17) +MAPPING_HELPER_SORT(threatre, 18) +MAPPING_HELPER_SORT(bar, 19) +MAPPING_HELPER_SORT(kitchen, 20) +MAPPING_HELPER_SORT(hydroponics, 21) +MAPPING_HELPER_SORT(janitor_closet, 22) +MAPPING_HELPER_SORT(genetics, 23) +MAPPING_HELPER_SORT(testing_range, 24) +MAPPING_HELPER_SORT(toxins, 25) +MAPPING_HELPER_SORT(dormitories, 26) +MAPPING_HELPER_SORT(virology, 27) +MAPPING_HELPER_SORT(xenobiology, 28) +MAPPING_HELPER_SORT(law_office, 29) +MAPPING_HELPER_SORT(detective_office, 30) + +#undef MAPPING_HELPER_SORT + +#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) + +GLOBAL_LIST_INIT(tagger_destination_areas, list( + "Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting), + "Cargo Bay" = list(/area/quartermaster), + "QM Office" = list(/area/quartermaster/qm, /area/quartermaster/qm_bedroom), + "Engineering" = list(/area/engine, /area/engineering), + "CE Office" = list(/area/crew_quarters/heads/chief), + "Atmospherics" = list(/area/engine/atmos, /area/engine/atmospherics_engine), + "Security" = list(/area/security), + "HoS Office" = list(/area/crew_quarters/heads/hos), + "Medbay" = list(/area/medical), + "CMO Office" = list(/area/crew_quarters/heads/cmo), + "Chemistry" = list(/area/medical/chemistry, /area/medical/apothecary), + "Research" = list(/area/science), + "RD Office" = list(/area/crew_quarters/heads/hor), + "Robotics" = list(/area/science/robotics), + "HoP Office" = list(/area/crew_quarters/heads/hop), + "Library" = list(/area/library), + "Chapel" = list(/area/chapel), + "Theatre" = list(/area/crew_quarters/theatre), + "Bar" = list(/area/crew_quarters/bar), + "Kitchen" = list(/area/crew_quarters/kitchen), + "Hydroponics" = list(/area/hydroponics), + "Janitor Closet" = list(/area/janitor), + "Genetics" = list(/area/medical/genetics), + "Testing Range" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), + "Toxins" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), + "Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms), + "Virology" = list(/area/medical/virology), + "Xenobiology" = list(/area/science/xenobiology), + "Law Office" = list(/area/lawoffice), + "Detective's Office" = list(/area/security/detectives_office), +)) + +#endif + diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index a70e44d4d7912..ad4f498bb79f4 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -234,84 +234,6 @@ GLOBAL_LIST_INIT(scarySounds, list( 'sound/weapons/thudswoosh.ogg', )) - -// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to -// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages -// tagged for the Cargo Bay. - -/* List of sortType codes for mapping reference -0 Waste -1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler. -2 Cargo Bay -3 QM Office -4 Engineering -5 CE Office -6 Atmospherics -7 Security -8 HoS Office -9 Medbay -10 CMO Office -11 Chemistry -12 Research -13 RD Office -14 Robotics -15 HoP Office -16 Library -17 Chapel -18 Theatre -19 Bar -20 Kitchen -21 Hydroponics -22 Janitor -23 Genetics -24 Testing Range -25 Toxins -26 Dormitories -27 Virology -28 Xenobiology -29 Law Office -30 Detective's Office -*/ - -//The whole system for the sorttype var is determined based on the order of this list, -//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude - -//If you don't want to fuck up disposals, add to this list, and don't change the order. -//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete - -GLOBAL_LIST_INIT(TAGGERLOCATIONS, list( - "Disposals", - "Cargo Bay", - "QM Office", - "Engineering", - "CE Office", - "Atmospherics", - "Security", - "HoS Office", - "Medbay", - "CMO Office", - "Chemistry", - "Research", - "RD Office", - "Robotics", - "HoP Office", - "Library", - "Chapel", - "Theatre", - "Bar", - "Kitchen", - "Hydroponics", - "Janitor Closet", - "Genetics", - "Testing Range", - "Toxins", - "Dormitories", - "Virology", - "Xenobiology", - "Law Office", - "Detective's Office", -)) - GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "") GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt") + "") diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 056bdb65eb4f6..2f5953ff772c3 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -148,7 +148,7 @@ SUBSYSTEM_DEF(traumas) /obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis, /obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes, /obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/bio_hood/plague, /obj/item/clothing/mask/gas/plaguedoctor)), + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/costume/plague, /obj/item/clothing/mask/gas/plaguedoctor)), "authority" = typecacheof(list( /obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/civilian/head_of_personnel, diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm index 561f23594f8cf..e1ec8aa8e7132 100644 --- a/code/datums/traits/negative_quirk.dm +++ b/code/datums/traits/negative_quirk.dm @@ -192,11 +192,11 @@ heirloom_type = pick(subtypesof(/obj/item/toy/mecha)) //look at this nerd //Medical if(JOB_NAME_CHIEFMEDICALOFFICER) - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/flashlight/pen) if(JOB_NAME_MEDICALDOCTOR) - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/flashlight/pen, /obj/item/scalpel) if(JOB_NAME_PARAMEDIC) - heirloom_type = pick(/obj/item/bodybag) + heirloom_type = pick(/obj/item/flashlight/pen, /obj/item/sensor_device) if(JOB_NAME_CHEMIST) heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom if(JOB_NAME_VIROLOGIST) diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index 0404b0517b67a..1acc5cf623b07 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -84,7 +84,7 @@ name = "plague doctor costume spawner" items = list( /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, - /obj/item/clothing/head/bio_hood/plague, + /obj/item/clothing/head/costume/plague, /obj/item/clothing/mask/gas/plaguedoctor) /obj/effect/spawner/bundle/costume/nightowl diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 5be91934e8016..20589f52313a8 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -385,6 +385,7 @@ /obj/item/resonator, /obj/item/mining_scanner, /obj/item/pickaxe, + /obj/item/shovel, /obj/item/stack/sheet/animalhide, /obj/item/stack/sheet/sinew, /obj/item/stack/sheet/bone, @@ -392,7 +393,8 @@ /obj/item/storage/fancy/cigarettes, /obj/item/reagent_containers/food/drinks/bottle, /obj/item/stack/medical, - /obj/item/knife/kitchen, + /obj/item/knife/combat/survival, + /obj/item/tank/internals/emergency_oxygen, /obj/item/reagent_containers/hypospray, /obj/item/gps, /obj/item/storage/bag/ore, @@ -411,6 +413,8 @@ /obj/item/skeleton_key, /obj/item/discovery_scanner, /obj/item/gun/energy/e_gun/mini/exploration, + /obj/item/gun/energy/kinetic_accelerator, + /obj/item/gun/energy/plasmacutter, /obj/item/grenade/exploration, /obj/item/exploration_detonator, /obj/item/research_disk_pinpointer diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index cf284792f17bb..2bf90d07bd56f 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -543,10 +543,6 @@ var/activated_name = null var/mutable_appearance/activated_overlay -/turf/closed/mineral/gibtonite/Initialize(mapload) - det_time = rand(8,10) //So you don't know exactly when the hot potato will explode - . = ..() - /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1) user.visible_message("[user] holds [I] to [src]...", "You use [I] to locate where to cut off the chain reaction and attempt to stop it...") diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 0444630fb8dd7..1ec1a0b6b5979 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -37,13 +37,15 @@ icon_state = "mailman" desc = "'Right-on-time' mail service head wear." -/obj/item/clothing/head/bio_hood/plague +/obj/item/clothing/head/costume/plague name = "plague doctor's hat" desc = "These were once used by plague doctors. They're pretty much useless." + item_state = "that" icon_state = "plaguedoctor" clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT permeability_coefficient = 0.01 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0) + flags_inv = HIDEHAIR /obj/item/clothing/head/costume/nursehat name = "nurse's hat" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 936e5c2db5ef3..7d5dc9a9181af 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -34,7 +34,7 @@ /obj/structure/closet/crate/necropolis/tendril/try_spawn_loot(datum/source, obj/item/item, mob/user, params) ///proc that handles key checking and generating loot - MAY REPLACE WITH pick_weight(loot) var/static/list/necropolis_goodies = list( //weights to be defined later on, for now they're all the same /obj/item/clothing/glasses/godeye = 5, - /obj/item/pickaxe/diamond = 5, + /obj/item/clothing/gloves/concussive_gauntlets = 5, /obj/item/rod_of_asclepius = 5, /obj/item/organ/heart/cursed/wizard = 5, /obj/item/ship_in_a_bottle = 5, @@ -666,6 +666,45 @@ name = "jacob's ladder" desc = "An indestructible celestial ladder that violates the laws of physics." +/obj/item/clothing/gloves/concussive_gauntlets + name = "concussive gauntlets" + desc = "Pickaxes... for your hands!" + icon_state = "concussive_gauntlets" + worn_icon_state = "concussive_gauntlets" + item_state = "combatgloves" + toolspeed = 0.1 //Sonic jackhammer, but only works on minerals. + strip_delay = 40 + equip_delay_other = 20 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = LAVA_PROOF | FIRE_PROOF //they are from lavaland after all + armor = list(MELEE = 15, BULLET = 35, LASER = 35, ENERGY = 20, BOMB = 35, BIO = 35, RAD = 35, FIRE = 0, ACID = 0, STAMINA = 20, BLEED = 20) //Equivalent to bone bracers. Not bad. + +/obj/item/clothing/gloves/concussive_gauntlets/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_GLOVES) + tool_behaviour = TOOL_MINING + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(rocksmash)) + RegisterSignal(user, COMSIG_MOVABLE_BUMP, PROC_REF(rocksmash)) + else + stopmining(user) + +/obj/item/clothing/gloves/concussive_gauntlets/dropped(mob/user) + . = ..() + stopmining(user) + +/obj/item/clothing/gloves/concussive_gauntlets/proc/stopmining(mob/user) + tool_behaviour = initial(tool_behaviour) + UnregisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) + UnregisterSignal(user, COMSIG_MOVABLE_BUMP) + +/obj/item/clothing/gloves/concussive_gauntlets/proc/rocksmash(mob/living/carbon/human/user, atom/rocks, proximity) + if(!ismineralturf(rocks)) + return + rocks.attackby(src, user) + ///Bosses //Legion diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index e839b766c9dd3..976f4a1babf2b 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -202,7 +202,6 @@ new /datum/data/vendor_equipment("Mining Bot Companion", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/vendor_equipment("Minebot Upgrade: Armor", /obj/item/minebot_upgrade/health, 400), new /datum/data/vendor_equipment("Minebot Upgrade: Ore Scoop", /obj/item/minebot_upgrade/ore_pickup, 400), - new /datum/data/vendor_equipment("Minebot Upgrade: Cooldown", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), new /datum/data/vendor_equipment("Minebot Upgrade: Medical", /obj/item/minebot_upgrade/medical, 800), new /datum/data/vendor_equipment("Minebot Upgrade: A.I.", /obj/item/slimepotion/slime/sentience/mining, 1000), new /datum/data/vendor_equipment("Minebot Weatherproof Chassis",/obj/item/minebot_upgrade/antiweather, 1200), diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 92353fa8a5813..707a0c84e5354 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -307,14 +307,26 @@ While using this makes the system rely on OnFire, it still gives options for tim w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 + var/using = FALSE /obj/item/tumor_shard/afterattack(atom/target, mob/user, proximity_flag) . = ..() if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite) && proximity_flag) var/mob/living/simple_animal/hostile/asteroid/elite/E = target - if(E.stat != DEAD || E.sentience_type != SENTIENCE_BOSS || !E.key) - user.visible_message("It appears [E] is unable to be revived right now. Perhaps try again later.") + if(E.stat != DEAD || E.sentience_type != SENTIENCE_BOSS) + user.visible_message("[E] does not respond to [src].") return + if(!E.key && !using) + using = TRUE //No ghost poll spam please. + user.visible_message("[E] stirs briefly...") + var/list/candidates = poll_candidates_for_mob("Do you want to take over as [E] (Lavaland Elite), silent servant of [user]?", ROLE_SENTIENCE, null, 15 SECONDS, E) + if(length(candidates)) + var/mob/dead/observer/C = pick(candidates) + E.key = C.key + else + user.visible_message("It appears [E] is unable to be revived right now. Perhaps try again later.") + using = FALSE + return E.faction = list("neutral") E.revive(full_heal = TRUE, admin_revive = TRUE) user.visible_message("[user] stabs [E] with [src], reviving it.") diff --git a/code/modules/multiz/movement/mob/living_zmove.dm b/code/modules/multiz/movement/mob/living_zmove.dm index 4c8ddb00b9809..60c33b8596dac 100644 --- a/code/modules/multiz/movement/mob/living_zmove.dm +++ b/code/modules/multiz/movement/mob/living_zmove.dm @@ -64,6 +64,7 @@ if(MOVETYPE_NONE_JUMP) visible_message("[src] jumps into the air, as if [p_they()] expected to float... Gravity pulls [p_them()] back down quickly.", "You try jumping into the space above you. Gravity pulls you back down quickly.") do_jump_animation() + adjustStaminaLoss(15, forced = TRUE) return FALSE if(MOVETYPE_JAUNT) move_verb = "moving" diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 6f7d03fc9ffa0..4311e4548f739 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -238,12 +238,14 @@ require_module = 1 module_type = list(/obj/item/robot_module/miner) module_flags = BORG_MODULE_MINER - var/denied_type = null + ///Should be the type path of mods in the same group + var/restricted_mod_type = null + ///Only used if restricted_mod_type is defined. How many mods of this type are allowed? var/maximum_of_type = 1 - var/cost = 30 - var/modifier = 1 //For use in any mod kit that has numerical modifiers - var/minebot_upgrade = TRUE - var/minebot_exclusive = FALSE + ///How much mod capacity, out of 100, does this mod use + var/cost = 25 + ///Will vary based on individual mod logic. Dictates the power of the mod. + var/modifier = 1 /obj/item/borg/upgrade/modkit/examine(mob/user) . = ..() @@ -263,20 +265,13 @@ /obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = TRUE - if(minebot_upgrade) - if(minebot_exclusive && !istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is only rated for minebot use.") - return FALSE - else if(istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is not rated for minebot use.") - return FALSE - if(denied_type) - var/number_of_denied = 0 + if(restricted_mod_type) + var/restricted_mod_count = 0 for(var/A in KA.get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - if(istype(M, denied_type)) - number_of_denied++ - if(number_of_denied >= maximum_of_type) + if(istype(M, restricted_mod_type)) + restricted_mod_count++ + if(restricted_mod_count >= maximum_of_type) . = FALSE break if(KA.get_remaining_mod_capacity() >= cost) @@ -287,7 +282,7 @@ playsound(loc, 'sound/items/screwdriver.ogg', 100, 1) KA.modkits += src else - to_chat(user, "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.") + to_chat(user, "You cannot install any more mods of this type. Remove mods with a crowbar and check their compatibility.") else to_chat(user, "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") . = FALSE @@ -318,7 +313,6 @@ name = "range increase" desc = "Increases the range of a kinetic accelerator when installed." modifier = 1 - cost = 25 /obj/item/borg/upgrade/modkit/range/modify_projectile(obj/projectile/kinetic/K) K.range += modifier @@ -328,7 +322,7 @@ /obj/item/borg/upgrade/modkit/damage name = "damage increase" desc = "Increases the damage of kinetic accelerator when installed." - modifier = 10 + modifier = 5 /obj/item/borg/upgrade/modkit/damage/modify_projectile(obj/projectile/kinetic/K) K.damage += modifier @@ -337,9 +331,9 @@ //Cooldown /obj/item/borg/upgrade/modkit/cooldown name = "cooldown decrease" - desc = "Decreases the cooldown of a kinetic accelerator. Not rated for minebot use." + desc = "Decreases the cooldown of a kinetic accelerator. Incompatible with rapid repeater mods." modifier = 3.2 - minebot_upgrade = FALSE + restricted_mod_type = /obj/item/borg/upgrade/modkit/cooldown/repeater /obj/item/borg/upgrade/modkit/cooldown/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -350,23 +344,14 @@ KA.overheat_time += modifier ..() -/obj/item/borg/upgrade/modkit/cooldown/minebot - name = "minebot cooldown decrease" - desc = "Decreases the cooldown of a kinetic accelerator. Only rated for minebot use." - icon_state = "door_electronics" - icon = 'icons/obj/module.dmi' - denied_type = /obj/item/borg/upgrade/modkit/cooldown/minebot - modifier = 5 - cost = 0 - minebot_upgrade = TRUE - minebot_exclusive = TRUE - //AoE blasts /obj/item/borg/upgrade/modkit/aoe modifier = 0 var/turf_aoe = FALSE var/stats_stolen = FALSE + restricted_mod_type = /obj/item/borg/upgrade/modkit/aoe + maximum_of_type = 2 /obj/item/borg/upgrade/modkit/aoe/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -404,32 +389,32 @@ /obj/item/borg/upgrade/modkit/aoe/turfs name = "mining explosion" - desc = "Causes the kinetic accelerator to destroy rock in an AoE." - denied_type = /obj/item/borg/upgrade/modkit/aoe/turfs + desc = "Causes the kinetic accelerator to destroy rock in an AoE. Only two AoE mods may be installed." turf_aoe = TRUE /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs name = "offensive mining explosion" - desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE." - maximum_of_type = 3 - modifier = 0.25 + desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE. Only two AoE mods may be installed." + maximum_of_type = 2 + modifier = 0.40 /obj/item/borg/upgrade/modkit/aoe/mobs name = "offensive explosion" - desc = "Causes the kinetic accelerator to damage mobs in an AoE." - modifier = 0.2 + desc = "Causes the kinetic accelerator to damage mobs in an AoE. Only two AoE mods may be installed." + maximum_of_type = 2 + modifier = 0.40 //Minebot passthrough /obj/item/borg/upgrade/modkit/minebot_passthrough name = "minebot passthrough" - desc = "Causes kinetic accelerator shots to pass through minebots." + desc = "Causes kinetic accelerator shots to pass through minebots. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/minebot_passthrough cost = 0 -//Tendril-unique modules /obj/item/borg/upgrade/modkit/cooldown/repeater name = "rapid repeater" - desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown." - denied_type = /obj/item/borg/upgrade/modkit/cooldown/repeater + desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown. Not compatible with any other cooldown mods." + restricted_mod_type = /obj/item/borg/upgrade/modkit/cooldown modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. cost = 50 @@ -450,7 +435,7 @@ desc = "Causes kinetic accelerator shots to slightly heal the firer on striking a living target." icon_state = "modkit_crystal" modifier = 2.5 //Not a very effective method of healing. - cost = 10 + cost = 0 //Obtained only from chests in limited quantities var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) /obj/item/borg/upgrade/modkit/lifesteal/projectile_prehit(obj/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) @@ -463,9 +448,8 @@ /obj/item/borg/upgrade/modkit/resonator_blasts name = "resonator blast" - desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts." - denied_type = /obj/item/borg/upgrade/modkit/resonator_blasts - cost = 30 + desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/resonator_blasts modifier = 0.25 //A bonus 15 damage if you burst the field on a target, 60 if you lure them into it. /obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) @@ -479,10 +463,9 @@ /obj/item/borg/upgrade/modkit/bounty name = "death syphon" - desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature." - denied_type = /obj/item/borg/upgrade/modkit/bounty + desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/bounty modifier = 1.25 - cost = 30 var/maximum_bounty = 25 var/list/bounties_reaped = list() @@ -521,9 +504,8 @@ name = "decrease pressure penalty" desc = "A syndicate modification kit that increases the damage a kinetic accelerator does in high pressure environments." modifier = 2 - denied_type = /obj/item/borg/upgrade/modkit/indoors - maximum_of_type = 1 - cost = 35 + restricted_mod_type = /obj/item/borg/upgrade/modkit/indoors + cost = 50 /obj/item/borg/upgrade/modkit/indoors/modify_projectile(obj/projectile/kinetic/K) K.pressure_decrease *= modifier @@ -532,9 +514,9 @@ //Trigger Guard /obj/item/borg/upgrade/modkit/trigger_guard name = "modified trigger guard" - desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed." - cost = 20 - denied_type = /obj/item/borg/upgrade/modkit/trigger_guard + desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed. Only one may be installed." + cost = 0 + restricted_mod_type = /obj/item/borg/upgrade/modkit/trigger_guard /obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -552,7 +534,7 @@ name = "super chassis" desc = "Makes your KA yellow. All the fun of having a more powerful KA without actually having a more powerful KA." cost = 0 - denied_type = /obj/item/borg/upgrade/modkit/chassis_mod + restricted_mod_type = /obj/item/borg/upgrade/modkit/chassis_mod var/chassis_icon = "kineticgun_u" var/chassis_name = "super-kinetic accelerator" @@ -575,9 +557,9 @@ /obj/item/borg/upgrade/modkit/tracer name = "white tracer bolts" - desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion." + desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion. Only one may be installed." cost = 0 - denied_type = /obj/item/borg/upgrade/modkit/tracer + restricted_mod_type = /obj/item/borg/upgrade/modkit/tracer var/bolt_color = "#FFFFFF" /obj/item/borg/upgrade/modkit/tracer/modify_projectile(obj/projectile/kinetic/K) diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index c0d09b3f44616..e41e7d00f75fe 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -146,8 +146,17 @@ category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE +/datum/design/board/efficiency + name = "Core Module Design (Efficiency)" + desc = "Allows for the construction of a Corporate AI Core Module." + id = "maintain_module" + materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/copper = 300) + build_path = /obj/item/aiModule/core/full/maintain + category = list("AI Modules") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + /datum/design/board/default_module - name = "Core Module Design (Default)" + name = "Core Module Design (Crewsimov)" desc = "Allows for the construction of a Default AI Core Module." id = "default_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/copper = 300) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index c09d4bc52451f..01e4fa09b090a 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -986,6 +986,7 @@ "asimov_module", "borg_ai_control", "corporate_module", + "maintain_module", "default_module", "freeform_module", "freeformcore_module", @@ -2265,7 +2266,7 @@ ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000, TECHWEB_POINT_TYPE_NANITES = 1000) export_price = 5000 - + /datum/techweb_node/nanite_cc id = "nanite_cc" tech_tier = 5 diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index d348f5b29ed57..103f411d41e9a 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -938,6 +938,10 @@ var/obj/item/slimecross/stabilized/gold/linked = linked_extract if(QDELETED(familiar)) familiar = new linked.mob_type(get_turf(owner.loc)) + familiar.a_intent = INTENT_HELP + ADD_TRAIT(familiar, TRAIT_PACIFISM, "stabilizedgold") + familiar.melee_damage = 0 + familiar.remove_verb(/mob/living/simple_animal/parrot/proc/toggle_mode) // just in case familiar.name = linked.mob_name familiar.del_on_death = TRUE familiar.copy_languages(owner, LANGUAGE_MASTER) diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_objects.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_objects.dm index 6c2ac6dc0df86..584d2c495a5ce 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_objects.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_objects.dm @@ -24,13 +24,6 @@ new /obj/structure/destructible/clockwork/sigil/transmission(power_turf) return ..() -/obj/effect/spawner/ocular_warden_setup/Initialize(mapload) - var/turf/T = get_turf(src) - new /obj/structure/destructible/clockwork/ocular_warden(T) - var/turf/open/power_turf = locate() in shuffle(view(3, src)) - new /obj/structure/destructible/clockwork/sigil/transmission(power_turf) - return ..() - /obj/effect/spawner/interdiction_lens_setup/Initialize(mapload) var/turf/T = get_turf(src) new /obj/structure/destructible/clockwork/gear_base/interdiction_lens/free(T) diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index ffd1bdb5887ad..e92544a2a746c 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -59,7 +59,7 @@ /obj/item/clothing/under/suit/sl = 1, /obj/item/clothing/mask/fakemoustache = 1, /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1, - /obj/item/clothing/head/bio_hood/plague = 1, + /obj/item/clothing/head/costume/plague = 1, /obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/costume/owl = 1, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index eb39dbefb83d5..1e810e04b5928 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -534,7 +534,7 @@ /obj/item/storage/backpack/virology = 2, /obj/item/storage/backpack/satchel/vir = 2) contraband = list(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1, - /obj/item/clothing/head/bio_hood/plague = 1, + /obj/item/clothing/head/costume/plague = 1, /obj/item/clothing/mask/gas/plaguedoctor = 1) refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe dept_req_for_free = ACCOUNT_MED_BITFLAG diff --git a/html/changelog.html b/html/changelog.html index ee03e5010776c..87b307417a296 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,52 @@ -->
+

02 September 2024

+

PowerfulBacon updated:

+ +

Rukofamicom, Fikou updated:

+ + +

01 September 2024

+

Aramix updated:

+ +

MarkusLarsson421 updated:

+ +

Penwin0 updated:

+ +

PowerfulBacon updated:

+ +

XeonMations updated:

+ +

rkz updated:

+ +

31 August 2024

PowerfulBacon updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 34b3c7436c5ed..b3ee171c49bba 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44046,3 +44046,51 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2024-08-31: PowerfulBacon: - bugfix: Fixes some mapping issues with RuntimeStation +2024-09-01: + Aramix: + - tweak: pacified all pets spawned by Xenobiology's Stabilized Gold + MarkusLarsson421: + - bugfix: Fixed so that Efficiency Law board can be printed. + - tweak: Changed the name of the Crewsimov board from "Default" to "Crewsimov". + Penwin0: + - bugfix: Plague Doctor hat no longer covers the face and doesn't look like a biohood + when held. + PowerfulBacon: + - rscadd: Adds in a new mapping helper for mapping disposal networks. + XeonMations: + - tweak: Bodybags can no longer be heirlooms. + - tweak: Medical flashlight pens, scalpels and suit sensors can now be heirlooms. + rkz: + - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on + a multi-z map +2024-09-02: + PowerfulBacon: + - bugfix: Fixes some mapping issues with DeltaStation. + Rukofamicom, Fikou: + - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond + pickaxe can no longer be found in tendril chests, and instead they may find + concussive gauntlets! + - tweak: Tumor shards will now poll ghosts for control of lavaland elites if the + original player has left the body. There is still no guarantee of having a new + pet if alternatives are not available. + - tweak: Gibtonite fuses are no longer variable so that miners with good timing + are more consistently rewarded for risking life and limb to try and defuse it. + - balance: PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. + This means it is now possible to utilize 100% of the weapon's potential and + up to four impactful mods may now be installed! + - balance: PKA modkits that do AoE damage have had their power doubled, but still + have an upper limit of 80% normal power. It is now far more practical to install + AoE damage mods, but will still weaken the power of the weapon overall in exchange + for versatility. + - balance: Damage increasing modkits have had their power halved. This was overlooked + during the major lavaland rebalance that halved the HP of all fauna and halved + the damage of mining tools. Damage modkits are supposed to increase damage by + 25% of base power, not 50%. + - tweak: All modkits are now compatible with mine bots, and the special cooldown + reduction mod has been removed since the normal cooldown mod works on them now. + Mine bots have the same capacity for mods as a PKA. + - tweak: 'Explorer webbing can now hold additional mining tools and items: shovel, + survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer + hold kitchen knives.' + - code_imp: Cleaned up some variable names and unnecessary code within the kinetic_accelerator + file. diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 5e3654908904d..e73ddd7e38f6a 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head/bio.dmi b/icons/mob/clothing/head/bio.dmi index ad9e34ae1e8fa..a1de696fcd439 100644 Binary files a/icons/mob/clothing/head/bio.dmi and b/icons/mob/clothing/head/bio.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index 1b302902a1799..5c7146529650f 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index e464a51594a3b..edea244cfdb38 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/head/bio.dmi b/icons/obj/clothing/head/bio.dmi index 8cd355aaaedcf..cdeacee33bfb2 100644 Binary files a/icons/obj/clothing/head/bio.dmi and b/icons/obj/clothing/head/bio.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index 601985072c131..58afa23afe49f 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ