From 9a0ca6ba11179497347ea95868556b72aaba3e35 Mon Sep 17 00:00:00 2001 From: KnigTheThrasher <152086196+KnigTheThrasher@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:59:20 +0200 Subject: [PATCH 1/5] fixblueshifttest (#2426) Co-authored-by: KnighTheThrasher --- _maps/map_files/Blueshift/Blueshift.dmm | 702 +++++++++++++----------- 1 file changed, 369 insertions(+), 333 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index c49fa0adc7cb..babcd80842a1 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -1086,7 +1086,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "akw" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -2881,7 +2881,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "aCY" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/cup/bowl{ @@ -3404,7 +3404,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "aIe" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -3442,7 +3442,7 @@ /obj/structure/table, /obj/item/wrench, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "aIH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -4350,7 +4350,7 @@ "aSL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "aSV" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -4362,7 +4362,7 @@ "aSZ" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "aTe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -5136,7 +5136,7 @@ "bba" = ( /obj/structure/closet/crate, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bbi" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -5420,7 +5420,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bdu" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -6343,7 +6343,7 @@ name = "Shuttle Bay Blast Door" }, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bnj" = ( /turf/open/floor/iron/dark/side{ dir = 6 @@ -7093,7 +7093,7 @@ /turf/open/floor/iron/stairs/medium{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bsR" = ( /obj/structure/railing{ dir = 4 @@ -9373,7 +9373,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bPG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -9562,6 +9562,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/station/maintenance/rus_gambling) +"bRo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/upper) "bRp" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -9918,7 +9924,7 @@ pixel_x = 9 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bUu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/bounty, @@ -10294,7 +10300,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "bYx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -11041,7 +11047,7 @@ "cgu" = ( /obj/effect/turf_decal/box/white/corners, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "cgB" = ( /obj/structure/showcase/cyborg/old{ pixel_y = 20 @@ -11189,7 +11195,7 @@ }, /obj/structure/cable, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "chF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11336,7 +11342,7 @@ pixel_y = 3 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ciT" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -13010,7 +13016,7 @@ /turf/open/floor/iron/stairs/right{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "cyg" = ( /obj/machinery/door/airlock/external{ space_dir = 4 @@ -13916,7 +13922,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "cFK" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -14174,7 +14180,7 @@ name = "Shuttle Bay Blast Door" }, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "cHF" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -15046,7 +15052,7 @@ }, /obj/item/crowbar, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "cQg" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -17358,7 +17364,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "dnV" = ( /obj/structure/table/wood, /obj/structure/closet/mini_fridge{ @@ -17426,7 +17432,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "doH" = ( /obj/machinery/light/small/broken/directional/east, /obj/structure/cable, @@ -18049,6 +18055,9 @@ /obj/machinery/light/directional/east, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) +"dwh" = ( +/turf/open/floor/iron, +/area/station/security/prison/upper) "dwi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18116,7 +18125,7 @@ /obj/structure/chair/sofa/bench/right, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "dwM" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/railing{ @@ -19967,7 +19976,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "dQD" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/door/airlock/captain{ @@ -20550,7 +20559,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/stairs/old, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "dVD" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -21749,7 +21758,7 @@ "ejd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eje" = ( /obj/structure/cable, /turf/open/floor/iron/cafeteria, @@ -23055,7 +23064,7 @@ /obj/structure/decorative/shelf/crates, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ewr" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/firealarm/directional/east{ @@ -23922,7 +23931,7 @@ "eDx" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eDF" = ( /turf/closed/wall, /area/station/maintenance/abandon_psych) @@ -24675,7 +24684,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eKU" = ( /turf/closed/wall/r_wall, /area/station/security/prison/visit) @@ -24775,7 +24784,7 @@ pixel_y = 5 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eLK" = ( /turf/open/floor/iron/stairs/right{ dir = 8 @@ -25625,7 +25634,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eTI" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -25640,7 +25649,7 @@ /obj/effect/turf_decal/vg_decals/numbers/two, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "eTS" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -26368,7 +26377,7 @@ "faw" = ( /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "faz" = ( /obj/effect/spawner/random/trash/cigbutt, /obj/effect/decal/cleanable/dirt, @@ -26861,7 +26870,7 @@ dir = 8 }, /turf/open/floor/iron/stairs, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "feL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -26962,7 +26971,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "fgj" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -28110,7 +28119,7 @@ "fri" = ( /obj/machinery/power/shuttle_engine/heater, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "fro" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet, @@ -28446,7 +28455,7 @@ /area/station/service/bar/atrium) "fvF" = ( /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "fvZ" = ( /obj/structure/chair/sofa/bench/right{ dir = 4; @@ -29441,7 +29450,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "fHR" = ( /obj/item/kirbyplants/random, /obj/structure/cable, @@ -29657,7 +29666,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "fJT" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32040,7 +32049,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "gib" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32370,7 +32379,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "glz" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -32431,7 +32440,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "glW" = ( /obj/structure/chair{ dir = 4 @@ -33078,7 +33087,7 @@ "grX" = ( /obj/structure/closet/crate/wooden, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "gsd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -33935,7 +33944,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "gAW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -34796,7 +34805,7 @@ "gKk" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "gKn" = ( /turf/open/floor/iron/stairs/right, /area/station/hallway/primary/central/aft) @@ -35275,7 +35284,7 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "gPq" = ( /obj/machinery/light/directional/east, /obj/machinery/camera/directional/east{ @@ -36447,7 +36456,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "hcf" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -36670,7 +36679,7 @@ /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "heh" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -38491,7 +38500,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "hxV" = ( /obj/structure/railing{ dir = 4 @@ -39477,7 +39486,7 @@ icon_state = "crateopen" }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "hHN" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39847,7 +39856,7 @@ "hLH" = ( /obj/structure/ore_box, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "hLJ" = ( /obj/structure/frame/machine, /turf/open/floor/plating, @@ -41277,7 +41286,7 @@ /area/station/science/ordnance) "hZI" = ( /turf/closed/wall, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "hZO" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/structure/disposalpipe/segment{ @@ -42582,7 +42591,7 @@ "inc" = ( /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ine" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/chair/sofa/bench/right{ @@ -42607,7 +42616,7 @@ /turf/open/floor/iron/stairs/left{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "inm" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -43262,7 +43271,7 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iuU" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -43632,7 +43641,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ixQ" = ( /obj/machinery/shower/directional/east, /obj/structure/drain, @@ -44040,7 +44049,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iCD" = ( /obj/structure/railing, /obj/structure/rack, @@ -44403,7 +44412,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iGa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44549,7 +44558,7 @@ "iHC" = ( /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iHD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -44596,7 +44605,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iIf" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/cigarette, @@ -45059,7 +45068,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iNE" = ( /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, @@ -45243,7 +45252,7 @@ name = "Flight Control" }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iQi" = ( /obj/effect/turf_decal/trimline/red/line{ dir = 8 @@ -45332,7 +45341,7 @@ /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iRe" = ( /obj/structure/chair{ dir = 8 @@ -45374,7 +45383,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "iRO" = ( /obj/structure/railing{ dir = 4 @@ -47778,7 +47787,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "jpC" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 9 @@ -48413,7 +48422,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "jvV" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, @@ -49936,7 +49945,7 @@ "jLj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "jLo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/seeds/liberty, @@ -50080,7 +50089,7 @@ /obj/machinery/newscaster/directional/west, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "jME" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50382,6 +50391,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery) +"jPf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "jPh" = ( /obj/item/wrench, /turf/open/floor/plating, @@ -51375,7 +51389,7 @@ /obj/structure/closet/crate/large, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "jYj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -53157,7 +53171,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "kox" = ( /obj/structure/bookcase/manuals/research_and_development, /obj/machinery/digital_clock/directional/north, @@ -54348,7 +54362,7 @@ /obj/machinery/light/directional/north, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "kzy" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -55301,7 +55315,7 @@ /obj/structure/door_assembly/door_assembly_sec, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "kKm" = ( /obj/machinery/door/airlock/external{ name = "Arrivals Dock"; @@ -56284,7 +56298,7 @@ width = 9 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "kWu" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -56484,7 +56498,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "kYw" = ( /obj/machinery/light_switch/directional/south, /obj/machinery/duct, @@ -57423,7 +57437,7 @@ "lgZ" = ( /obj/structure/ore_box, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "lhd" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -60417,7 +60431,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "lME" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area{ @@ -60463,7 +60477,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "lMX" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 4 @@ -61441,7 +61455,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "lWO" = ( /obj/machinery/shower/directional/west, /obj/structure/drain, @@ -62337,7 +62351,7 @@ "mfh" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mfi" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/coffee/no_lid{ @@ -62372,7 +62386,7 @@ /obj/machinery/light_switch/directional/north, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mfI" = ( /obj/structure/closet/secure_closet/detective, /turf/open/floor/wood/parquet, @@ -62447,7 +62461,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mgu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62639,7 +62653,7 @@ }, /obj/item/clothing/head/utility/welding, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "miB" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 @@ -62803,6 +62817,12 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/iron, /area/station/command/captain_dining) +"mkp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison/upper) "mky" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63138,7 +63158,7 @@ /turf/open/floor/iron/stairs{ dir = 4 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "moI" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -63549,7 +63569,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "msV" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -64596,7 +64616,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mEs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -64915,7 +64935,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mHg" = ( /obj/structure/chair/stool{ pixel_y = 3 @@ -65106,7 +65126,7 @@ /obj/structure/table, /obj/item/fuel_pellet, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mJa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65304,7 +65324,7 @@ name = "Security Dock 1" }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mKN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -65862,7 +65882,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mQG" = ( /obj/machinery/door/airlock/research{ name = "Robotics Surgery" @@ -66605,7 +66625,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "mYc" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, @@ -70055,7 +70075,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "nJh" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -70549,7 +70569,7 @@ "nOQ" = ( /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "nPa" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks{ @@ -71864,7 +71884,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "obM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -71896,7 +71916,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oci" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ color = "#DE3A3A"; @@ -71988,7 +72008,7 @@ /obj/machinery/newscaster/directional/west, /obj/structure/cable, /turf/open/floor/iron/stairs/old, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "odj" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -72644,7 +72664,7 @@ "oih" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oil" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73511,7 +73531,7 @@ "oql" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oqn" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -73712,7 +73732,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "osc" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -74348,7 +74368,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oyK" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/siding/wood{ @@ -74661,7 +74681,7 @@ "oBL" = ( /obj/machinery/door/window/right/directional/north, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oBO" = ( /obj/machinery/conveyor{ dir = 8; @@ -74795,7 +74815,7 @@ /obj/structure/closet/crate/bin, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oDl" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -76529,7 +76549,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oUJ" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -76705,7 +76725,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "oWE" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -77426,7 +77446,7 @@ "peU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "peV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -77635,7 +77655,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "phG" = ( /obj/machinery/light/directional/north, /obj/machinery/newscaster/directional/north, @@ -77806,7 +77826,7 @@ "piH" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "piL" = ( /turf/closed/wall, /area/station/hallway/secondary/exit) @@ -78447,7 +78467,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ppC" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -78840,6 +78860,11 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron/dark, /area/station/command/bridge) +"pub" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison/upper) "puc" = ( /obj/structure/window/spawner/directional/west, /obj/structure/flora/bush/fullgrass, @@ -79642,7 +79667,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "pBo" = ( /turf/closed/wall, /area/station/commons/fitness) @@ -80555,7 +80580,7 @@ dir = 1 }, /turf/open/floor/iron/dark/side, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "pKZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -81024,7 +81049,7 @@ }, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "pPJ" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/innards, @@ -81236,7 +81261,7 @@ "pSi" = ( /obj/structure/table/reinforced, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "pSk" = ( /obj/effect/turf_decal/bot, /obj/item/beacon, @@ -81989,7 +82014,7 @@ /obj/machinery/light/directional/south, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "pYF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/port_gen/pacman/pre_loaded, @@ -82220,7 +82245,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qbD" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/east, @@ -82472,7 +82497,7 @@ /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qdV" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 @@ -83212,7 +83237,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qlH" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -83795,7 +83820,7 @@ name = "Labor Camp Shuttle Airlock" }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qrm" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -84540,7 +84565,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qxV" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/south, @@ -84913,7 +84938,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qBm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, @@ -85820,7 +85845,7 @@ /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "qJb" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes{ @@ -87782,7 +87807,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rdo" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/light/directional/east, @@ -87819,7 +87844,7 @@ /obj/item/folder/red, /obj/item/pen, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rdB" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/siding/wood{ @@ -87991,7 +88016,7 @@ "reQ" = ( /obj/item/clothing/head/utility/hardhat, /turf/open/floor/plating, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "reW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -88031,7 +88056,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rfv" = ( /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral{ @@ -88536,6 +88561,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"rkk" = ( +/turf/closed/wall/r_wall, +/area/station/security/prison/upper) "rko" = ( /obj/effect/spawner/liquids_spawner{ reagent_list = list(/datum/reagent/water=600) @@ -88750,7 +88778,7 @@ name = "Flight Control" }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rmf" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/freezer, @@ -88842,7 +88870,7 @@ "rnl" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rno" = ( /turf/closed/wall, /area/station/science/ordnance/testlab) @@ -90851,7 +90879,7 @@ /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rGl" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Launch Site" @@ -91151,7 +91179,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rJf" = ( /obj/structure/window/reinforced/tinted/spawner/directional/east, /obj/item/toy/plush/slimeplushie{ @@ -92060,7 +92088,7 @@ "rUv" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "rUA" = ( /obj/machinery/door/airlock/external{ space_dir = 8 @@ -93585,7 +93613,7 @@ /obj/effect/decal/cleanable/oil/slippery, /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "skq" = ( /obj/machinery/door/poddoor/preopen{ id = "xenosecure"; @@ -93843,7 +93871,7 @@ }, /obj/item/wirecutters, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sna" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -94276,7 +94304,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "srJ" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/side{ @@ -95212,7 +95240,7 @@ name = "Security Dock 2" }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sAW" = ( /obj/structure/railing{ dir = 8 @@ -95244,7 +95272,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sBj" = ( /obj/structure/window/spawner/directional/east, /obj/structure/flora/bush/jungle/a/style_3, @@ -95789,7 +95817,7 @@ "sGa" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sGk" = ( /obj/structure/reagent_dispensers/fueltank{ pixel_y = 1 @@ -95908,7 +95936,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sHt" = ( /turf/open/floor/iron/white, /area/station/medical/treatment_center) @@ -96002,7 +96030,7 @@ }, /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sIk" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, @@ -97008,7 +97036,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "sRD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -101783,7 +101811,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "tMA" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/simple/general/visible, @@ -103387,7 +103415,7 @@ pixel_x = -5 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "udb" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -104484,7 +104512,7 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "ulM" = ( /obj/structure/closet/crate/bin, /obj/effect/spawner/random/trash/garbage, @@ -105018,7 +105046,7 @@ req_access = list("security") }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "uqL" = ( /obj/structure/closet/crate/bin, /obj/machinery/light_switch/directional/west, @@ -105450,7 +105478,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "uve" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -105618,7 +105646,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "uwO" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -105882,7 +105910,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "uzi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -105938,6 +105966,11 @@ "uzK" = ( /turf/closed/wall, /area/station/medical/medbay/central) +"uzN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison/upper) "uzV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -111577,7 +111610,7 @@ "vDP" = ( /obj/structure/chair/sofa/bench/left, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "vDR" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -111750,7 +111783,7 @@ /obj/structure/decorative/shelf/crates1, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "vFr" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, @@ -112617,7 +112650,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "vNd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -117408,6 +117441,9 @@ "wHI" = ( /turf/closed/wall, /area/station/maintenance/central) +"wHR" = ( +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "wHW" = ( /obj/machinery/status_display/ai/directional/north, /obj/structure/cable, @@ -117546,7 +117582,7 @@ }, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "wJj" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -118031,7 +118067,7 @@ /obj/effect/turf_decal/stripes, /obj/structure/cable, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "wOR" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch{ @@ -118434,7 +118470,7 @@ pixel_y = 30 }, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "wSn" = ( /obj/structure/closet{ name = "security locker" @@ -118764,7 +118800,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "wWk" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/airalarm/directional/south, @@ -121143,7 +121179,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "xuX" = ( /obj/machinery/computer/shuttle/mining, /obj/effect/turf_decal/tile/brown, @@ -122892,7 +122928,7 @@ /obj/effect/turf_decal/bot_white, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "xNy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/liquids_spawner, @@ -123865,7 +123901,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/area/station/security/prison/upper) "xYm" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -146286,14 +146322,14 @@ egv iKs iKs iKs -mjE -mjE -mjE -mjE -mjE -mjE +rkk +rkk +rkk +rkk +rkk +rkk gLI -mjE +rkk ltN cDn cDn @@ -146543,14 +146579,14 @@ iKs iKs fZI exN -mjE +rkk bba hLH -euE +wHR bba hHM chC -mjE +rkk ltN ltN fNe @@ -146800,14 +146836,14 @@ bsG bsG fZI sJq -mjE -euE +rkk +wHR inc rUv -euE +wHR hLH chC -mjE +rkk ylg frJ uWm @@ -147056,21 +147092,21 @@ fZI fZI bsG bsG -mjE -mjE +rkk +rkk iIe iIe iIe iIe iIe moF -mjE -mjE -mjE -mjE -mjE -mjE -mjE +rkk +rkk +rkk +rkk +rkk +rkk +rkk bbm aXM ltX @@ -147315,18 +147351,18 @@ fZI fZI bng rfs -euE -euE -euE -euE -euE +wHR +wHR +wHR +wHR +wHR iHC iRJ skk -euE +wHR hce sAN -euE +wHR gKk bbm dfX @@ -147571,20 +147607,20 @@ fZI fZI fZI bng -euE +wHR faw -euE -euE +wHR +wHR cQf -euE +wHR iHC -euE -euE -euE -euE +wHR +wHR +wHR +wHR sAN -euE -euE +wHR +wHR bbm jVT cBY @@ -147828,11 +147864,11 @@ fZI fZI fZI bng -euE -euE -euE +wHR +wHR +wHR qdQ -euE +wHR eTL iHC xNm @@ -148085,19 +148121,19 @@ fZI fZI fZI bng -euE -euE +wHR +wHR inc -euE -euE -euE -euE -euE +wHR +wHR +wHR +wHR +wHR fri wSj -euE +wHR sAN -euE +wHR iHC bbm oRy @@ -148343,18 +148379,18 @@ fZI fZI bng qxT -euE -euE -euE +wHR +wHR +wHR faw -euE -euE +wHR +wHR nOQ -euE -euE +wHR +wHR cgu sAN -euE +wHR iHC bbm bbm @@ -148597,8 +148633,8 @@ fZI fZI fZI fZI -mjE -mjE +rkk +rkk kzx doG doG @@ -148606,9 +148642,9 @@ eTH iNB feJ faw -mhN +jPf bdt -mhN +jPf hZI hZI jLj @@ -148618,7 +148654,7 @@ grX vFo hZI mfh -mjE +rkk cXk rYT mWp @@ -148856,25 +148892,25 @@ fZI fZI oql rGh -jHK +dwh aIF iFX smY ejd doG doG -mhN +jPf ciS wOH odg dVC iHC glU -euE -euE -euE +wHR +wHR +wHR rme -euE +wHR iQb tcI mzK @@ -149113,25 +149149,25 @@ fZI fZI oql qIZ -jHK +dwh miw sRx mIY ejd msT msT -mhN +jPf rdz ixK uqK hZI mfE glU -euE -euE -euE +wHR +wHR +wHR rme -euE +wHR iQb tcI ctM @@ -149368,18 +149404,18 @@ fZI fZI fZI fZI -mjE -mjE +rkk +rkk occ msT msT wWj lMz jpA -euE -mhN +wHR +jPf mHe -mhN +jPf hZI hZI aSL @@ -149389,7 +149425,7 @@ lgZ ewk hZI sGa -mjE +rkk wMc rYT xyx @@ -149628,25 +149664,25 @@ fZI fZI cHs rfs -euE -euE -euE -euE +wHR +wHR +wHR +wHR oyI -euE -euE -euE -euE +wHR +wHR +wHR +wHR hce mKJ -euE +wHR sBh -mhN -mhN -mhN +jPf +jPf +jPf hZI hZI -mjE +rkk rKn pEk mWp @@ -149884,26 +149920,26 @@ fZI fZI fZI cHs -euE +wHR faw -euE -euE -euE +wHR +wHR +wHR oyI inc -euE -euE -euE -euE +wHR +wHR +wHR +wHR mKJ -euE +wHR sBh -mhN +jPf jYd dQz lWM uzh -mjE +rkk iNU rYT rtp @@ -150141,26 +150177,26 @@ fZI fZI fZI cHs -euE -euE -euE +wHR +wHR +wHR qdQ -euE +wHR uwI -euE +wHR qdQ -euE -euE +wHR +wHR inc mKJ -euE +wHR sHr hZI oih ghV gly ulK -mjE +rkk qaa rYT eKa @@ -150398,26 +150434,26 @@ fZI fZI fZI cHs -euE -euE -euE -euE +wHR +wHR +wHR +wHR inc oyI -euE +wHR faw -euE -euE -euE +wHR +wHR +wHR mKJ -euE +wHR bYs kKk -jHK +dwh fvF oWD dnO -mjE +rkk rYi rYT rKn @@ -150656,25 +150692,25 @@ fZI fZI cHs qxT -euE +wHR piH -euE -euE +wHR +wHR oyI -euE +wHR kWs piH -euE +wHR cgu mKJ -euE +wHR sBh hZI aSZ reQ eKF gPp -mjE +rkk ofH pyk eBw @@ -150911,9 +150947,9 @@ fZI fZI mcS hQc -mjE +rkk hZI -mhN +jPf hZI uuZ hZI @@ -150921,17 +150957,17 @@ bsN hZI qrh hZI -mhN +jPf hZI hZI inl cyc hZI -mjE +rkk pSi pSi pSi -mjE +rkk low kxG rKn @@ -151173,9 +151209,9 @@ ebG dwK mgt iHC -mhN -vUC -mhN +jPf +pub +jPf iHC xYh aHZ @@ -151184,11 +151220,11 @@ qBh phD aCT vMY -mjE -mhN -mhN -mhN -mjE +rkk +jPf +jPf +jPf +rkk pyk dAg eBw @@ -151430,9 +151466,9 @@ ebG vDP peU iCC -mhN -yfU -mhN +jPf +bRo +jPf fJP hZI gAV @@ -151441,7 +151477,7 @@ pBb oDh kow pps -mhN +jPf xVt cFu poD @@ -151690,7 +151726,7 @@ hZI hZI nJe hZI -mhN +jPf hZI osb hZI @@ -151698,7 +151734,7 @@ pPF oBL hxO tMz -mjE +rkk cYq saz nnK @@ -151942,20 +151978,20 @@ uLe fDq ebG iRb -xJs +uzN jMz sIh -vUC +pub hZI uda wJg cFI -mhN +jPf phD kYo lMR oUI -mjE +rkk dsA nwj pAF @@ -152201,18 +152237,18 @@ lzN akv qby jvQ -qnt +mkp jvQ iuT jvQ -qnt +mkp xuV bPE aCT hef rdj srD -mhN +jPf cYq nwj nnK @@ -152455,8 +152491,8 @@ hjL lhI iuU mcS -mjE -mjE +rkk +rkk rIX rnl bUp @@ -152464,7 +152500,7 @@ hZI obJ eLF fgg -mhN +jPf fHM qlC qlC @@ -152712,21 +152748,21 @@ mcS ptx bbi nZp -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE -mjE +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk +rkk kts lTN nnK From 2e62742d15235c81cc13eedf8a4bef3dd3f88af6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:12:01 +0000 Subject: [PATCH 2/5] Automatic changelog for PR #2426 [ci skip] --- html/changelogs/AutoChangeLog-pr-2426.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2426.yml diff --git a/html/changelogs/AutoChangeLog-pr-2426.yml b/html/changelogs/AutoChangeLog-pr-2426.yml new file mode 100644 index 000000000000..a56d1bb3e2c0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2426.yml @@ -0,0 +1,4 @@ +author: "KnigTheThrasher" +delete-after: True +changes: + - bugfix: ":)" \ No newline at end of file From 9b2cd5ee134c94a6a2d765a5399ef4eedd419caf Mon Sep 17 00:00:00 2001 From: Rafael <34388545+RafRoq@users.noreply.github.com> Date: Wed, 26 Jun 2024 20:52:56 -0300 Subject: [PATCH 3/5] new botany trait (#2430) --- code/modules/hydroponics/plant_genes.dm | 9 +++++++-- code/modules/hydroponics/seeds.dm | 12 ++++++++---- monkestation/code/modules/botany/new_seeds/seeds.dm | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index d84bf59dbd67..4f92ba56807e 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -974,13 +974,13 @@ /datum/plant_gene/trait/never_mutate name = "Prosophobic Inclination" description = "The plant does not mutate normally, but may give a mutated produce." - mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE + mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE /// Prevents stat mutation caused by instability. Trait acts as a tag for hydroponics.dm to recognise. /datum/plant_gene/trait/stable_stats name = "Symbiotic Resilience" description = "High instability does not affect the plant stats." - mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE + mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE /// Traits for flowers, makes plants not decompose. /datum/plant_gene/trait/preserved @@ -1025,3 +1025,8 @@ /datum/plant_gene/trait/plant_type/alien_properties name ="?????" icon = "reddit-alien" + +/datum/plant_gene/trait/seedless + name = "Seedless" + description = "The plant is unable to produce seeds" + mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 0ed59098c1b8..9f0997f83afd 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -254,6 +254,7 @@ ///Name of the grown products. var/product_name var/seed_harvest_ratio = 0.2 + var/seedless = get_gene(/datum/plant_gene/trait/seedless) ///the value of yield that the harvest amount stops being linear and slows down var/yield_linearity_breakpoint = 100 ///linear region growth coeff @@ -272,12 +273,15 @@ if(plant_yield >= yield_linearity_breakpoint) harvest_amount = qp_sigmoid(yield_linearity_breakpoint, maximum_harvest_amount, plant_yield) - maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) + if(!seedless) + maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) + else harvest_amount = floor(plant_yield * harvest_linear_coeff) - maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) - if ((plant_yield > 0 && maximum_seed_production == 0) && prob(50)) - maximum_seed_production = 1 + if(!seedless) + maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) + if ((plant_yield > 0 && maximum_seed_production == 0) && prob(50)) + maximum_seed_production = 1 while(harvest_counter < harvest_amount) while(seed_counter < maximum_seed_production) diff --git a/monkestation/code/modules/botany/new_seeds/seeds.dm b/monkestation/code/modules/botany/new_seeds/seeds.dm index e1fb666b909e..f654551cc389 100644 --- a/monkestation/code/modules/botany/new_seeds/seeds.dm +++ b/monkestation/code/modules/botany/new_seeds/seeds.dm @@ -52,7 +52,7 @@ icon_grow = "TreeCash-G" possible_mutations = list() - genes = list(/datum/plant_gene/trait/repeated_harvest) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/seedless) product = /obj/item/stack/spacecash/c10 /obj/item/seeds/tree/steel From ea6ee444b640c5d24a00b0eccb694149e32d0b8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:53:18 +0000 Subject: [PATCH 4/5] Automatic changelog for PR #2430 [ci skip] --- html/changelogs/AutoChangeLog-pr-2430.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2430.yml diff --git a/html/changelogs/AutoChangeLog-pr-2430.yml b/html/changelogs/AutoChangeLog-pr-2430.yml new file mode 100644 index 000000000000..82b376eb9bcd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2430.yml @@ -0,0 +1,4 @@ +author: "RafRoq" +delete-after: True +changes: + - rscadd: "Added new botany plant trait, seedless, can be found in money tree seeds\n:cl:" \ No newline at end of file From 0bcae557dd0ecfae6c6c3840c3223d66d8d3dc29 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 27 Jun 2024 01:19:55 +0000 Subject: [PATCH 5/5] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-1817.yml | 16 ------ html/changelogs/AutoChangeLog-pr-2055.yml | 5 -- html/changelogs/AutoChangeLog-pr-2059.yml | 4 -- html/changelogs/AutoChangeLog-pr-2100.yml | 4 -- html/changelogs/AutoChangeLog-pr-2107.yml | 13 ----- html/changelogs/AutoChangeLog-pr-2361.yml | 4 -- html/changelogs/AutoChangeLog-pr-2365.yml | 7 --- html/changelogs/AutoChangeLog-pr-2375.yml | 4 -- html/changelogs/AutoChangeLog-pr-2413.yml | 4 -- html/changelogs/AutoChangeLog-pr-2417.yml | 4 -- html/changelogs/AutoChangeLog-pr-2419.yml | 5 -- html/changelogs/AutoChangeLog-pr-2420.yml | 4 -- html/changelogs/AutoChangeLog-pr-2421.yml | 4 -- html/changelogs/AutoChangeLog-pr-2426.yml | 4 -- html/changelogs/AutoChangeLog-pr-2430.yml | 4 -- html/changelogs/archive/2024-06.yml | 67 +++++++++++++++++++++++ 16 files changed, 67 insertions(+), 86 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-1817.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2055.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2059.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2100.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2107.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2361.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2365.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2375.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2413.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2417.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2419.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2420.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2421.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2426.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2430.yml diff --git a/html/changelogs/AutoChangeLog-pr-1817.yml b/html/changelogs/AutoChangeLog-pr-1817.yml deleted file mode 100644 index 2180f68eb6c2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1817.yml +++ /dev/null @@ -1,16 +0,0 @@ -author: "Rex9001, DexeeXI" -delete-after: True -changes: - - rscadd: "Brig Physician as a job" - - rscadd: "Clothing items for Brig Physician: jumpsuit, skirt, scrubs, shoes, backpacks of all kinds." - - rscadd: "Plasmaman support for Brig Physician. Sprites provided directly by DimWhat." - - rscadd: "Alternative job title support for Brig Physician" - - rscadd: "SECHUD, Crew Monitor and ID card support for Brig Physician" - - rscadd: "Locker specifically for Brig Physician" - - rscadd: "Digi-legs support for new clothes for Lizards." - - rscadd: "Most new items have inhand sprites" - - rscadd: "Brig Physician start markers in Prison Medbays." - - rscadd: "Requested alternative title for Medical Doctor. (Admin Team Request)" - - balance: "All prison medbays overhauled to provide proper support. The old tram medbay was completely bare while Box was mostly \"feature complete\". All medbays should have very similar capability." - - bugfix: "Head of Personnel's supervisor is now the Captain properly." - - rscdel: "Virus extrapolator in the CMO's locker is now gone. (I don't know how I missed this one)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2055.yml b/html/changelogs/AutoChangeLog-pr-2055.yml deleted file mode 100644 index f6daa4d8a40f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2055.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "ven1883" -delete-after: True -changes: - - rscadd: "Adds Alveolic Deoxidation, a nanite program that heals suffocation." - - rscadd: "Adds Alveolic Deoxidation to the tech tree." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2059.yml b/html/changelogs/AutoChangeLog-pr-2059.yml deleted file mode 100644 index 50cc8f5afc95..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2059.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - qol: "Placing someone on an operating table now actually buckles them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2100.yml b/html/changelogs/AutoChangeLog-pr-2100.yml deleted file mode 100644 index 5f5a19393a8b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2100.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Uristthedorf" -delete-after: True -changes: - - qol: "You can craft plastitanium shards." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2107.yml b/html/changelogs/AutoChangeLog-pr-2107.yml deleted file mode 100644 index 13db4d58a069..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2107.yml +++ /dev/null @@ -1,13 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - rscadd: "Engineers now have an RCD round start." - - balance: "RCD construction/deconstruction effects can now be attacked in order to cancel them. You can get the anti-disruption upgrade disk to prevent this." - - balance: "RCD construction/deconstruction is now slower if you already have another effect up. This does not effect reconstruction." - - balance: "Both of the above effects do not effect the CE's roundstart RCD, nor any other RCDs such as combat RCDs." - - rscadd: "RCDs can make girders now." - - bugfix: "Some RCD constructs took more material than manual construction. The RCD cost should be consistent in comparison to manual construction now." - - bugfix: "RCDs can build wallmounts on reinforced walls." - - qol: "RCDs can build directional windows without requiring/building a grill." - - bugfix: "You should be able to click on lattices on icebox with the RCD and construct a floor now" - - balance: "Maintenance drones now can use RPED, RCD, holosigns, and spray bottles." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2361.yml b/html/changelogs/AutoChangeLog-pr-2361.yml deleted file mode 100644 index 77c38213c9f1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2361.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - qol: "Prettied up the Chemical Analyzer's output in chat, making it easier to read, especially when scanning multiple things." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2365.yml b/html/changelogs/AutoChangeLog-pr-2365.yml deleted file mode 100644 index 53c071d3b153..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2365.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - image: "(intercepti0n) Resprites t-ray scanner, gas analyzer, geiger counter and hand drill." - - image: "(LT3) Medical and improvised gauze are visibly different from cloth." - - image: "(Alecksohs) Updated the Advanced Surgical Tool's sprites." - - code_imp: "(Alecksohs) Updated the Advanced Surgical Tool's light code." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2375.yml b/html/changelogs/AutoChangeLog-pr-2375.yml deleted file mode 100644 index d8a49c7f70e2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2375.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TTNT789" -delete-after: True -changes: - - rscadd: "The Ashen Forge as a traitor faction" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2413.yml b/html/changelogs/AutoChangeLog-pr-2413.yml deleted file mode 100644 index 5a757c1ac2b8..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2413.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - rscadd: "Added liquid barriers, currently mapped into xenobio, which block all liquid flow across them, hopefully preventing the dreaded station-wide ooze floods." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2417.yml b/html/changelogs/AutoChangeLog-pr-2417.yml deleted file mode 100644 index 9eb2bb7fee31..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2417.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DustanHache" -delete-after: True -changes: - - rscadd: "Egg bags are now craftable using cloth, like many other bags." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2419.yml b/html/changelogs/AutoChangeLog-pr-2419.yml deleted file mode 100644 index e9b7edf7208d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2419.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Kapu1178" -delete-after: True -changes: - - bugfix: "Fixed stuff relating to the MODsuit pathfinder module." - - code_imp: "AI pathfinding should produce slightly better paths." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2420.yml b/html/changelogs/AutoChangeLog-pr-2420.yml deleted file mode 100644 index 13c532a200a4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2420.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DexeeXI" -delete-after: True -changes: - - rscadd: "New Title for Captains" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2421.yml b/html/changelogs/AutoChangeLog-pr-2421.yml deleted file mode 100644 index ca290d4cc821..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2421.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KnigTheThrasher" -delete-after: True -changes: - - bugfix: "fixed latejoin prisoner spawns" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2426.yml b/html/changelogs/AutoChangeLog-pr-2426.yml deleted file mode 100644 index a56d1bb3e2c0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2426.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KnigTheThrasher" -delete-after: True -changes: - - bugfix: ":)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2430.yml b/html/changelogs/AutoChangeLog-pr-2430.yml deleted file mode 100644 index 82b376eb9bcd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2430.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "RafRoq" -delete-after: True -changes: - - rscadd: "Added new botany plant trait, seedless, can be found in money tree seeds\n:cl:" \ No newline at end of file diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 6b2a2daa1718..3e37612116d8 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -538,3 +538,70 @@ overall by all sats. - balance: Slightly boosted the range of meteor defense satellite from 14 to 16 tiles. +2024-06-27: + Absolucy: + - rscadd: Engineers now have an RCD round start. + - balance: RCD construction/deconstruction effects can now be attacked in order + to cancel them. You can get the anti-disruption upgrade disk to prevent this. + - balance: RCD construction/deconstruction is now slower if you already have another + effect up. This does not effect reconstruction. + - balance: Both of the above effects do not effect the CE's roundstart RCD, nor + any other RCDs such as combat RCDs. + - rscadd: RCDs can make girders now. + - bugfix: Some RCD constructs took more material than manual construction. The RCD + cost should be consistent in comparison to manual construction now. + - bugfix: RCDs can build wallmounts on reinforced walls. + - qol: RCDs can build directional windows without requiring/building a grill. + - bugfix: You should be able to click on lattices on icebox with the RCD and construct + a floor now + - balance: Maintenance drones now can use RPED, RCD, holosigns, and spray bottles. + - rscadd: Added liquid barriers, currently mapped into xenobio, which block all + liquid flow across them, hopefully preventing the dreaded station-wide ooze + floods. + - image: (intercepti0n) Resprites t-ray scanner, gas analyzer, geiger counter and + hand drill. + - image: (LT3) Medical and improvised gauze are visibly different from cloth. + - image: (Alecksohs) Updated the Advanced Surgical Tool's sprites. + - code_imp: (Alecksohs) Updated the Advanced Surgical Tool's light code. + - qol: Placing someone on an operating table now actually buckles them. + - qol: Prettied up the Chemical Analyzer's output in chat, making it easier to read, + especially when scanning multiple things. + DexeeXI: + - rscadd: New Title for Captains + DustanHache: + - rscadd: Egg bags are now craftable using cloth, like many other bags. + Kapu1178: + - bugfix: Fixed stuff relating to the MODsuit pathfinder module. + - code_imp: AI pathfinding should produce slightly better paths. + KnigTheThrasher: + - bugfix: fixed latejoin prisoner spawns + - bugfix: :) + RafRoq: + - rscadd: 'Added new botany plant trait, seedless, can be found in money tree seeds + + :cl:' + Rex9001, DexeeXI: + - rscadd: Brig Physician as a job + - rscadd: 'Clothing items for Brig Physician: jumpsuit, skirt, scrubs, shoes, backpacks + of all kinds.' + - rscadd: Plasmaman support for Brig Physician. Sprites provided directly by DimWhat. + - rscadd: Alternative job title support for Brig Physician + - rscadd: SECHUD, Crew Monitor and ID card support for Brig Physician + - rscadd: Locker specifically for Brig Physician + - rscadd: Digi-legs support for new clothes for Lizards. + - rscadd: Most new items have inhand sprites + - rscadd: Brig Physician start markers in Prison Medbays. + - rscadd: Requested alternative title for Medical Doctor. (Admin Team Request) + - balance: All prison medbays overhauled to provide proper support. The old tram + medbay was completely bare while Box was mostly "feature complete". All medbays + should have very similar capability. + - bugfix: Head of Personnel's supervisor is now the Captain properly. + - rscdel: Virus extrapolator in the CMO's locker is now gone. (I don't know how + I missed this one) + TTNT789: + - rscadd: The Ashen Forge as a traitor faction + Uristthedorf: + - qol: You can craft plastitanium shards. + ven1883: + - rscadd: Adds Alveolic Deoxidation, a nanite program that heals suffocation. + - rscadd: Adds Alveolic Deoxidation to the tech tree.