diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 22a59bb5fa5e..0c96ffbd6d5f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -375,8 +375,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/splicer, /obj/item/food/grown/poppy/lily, +/obj/machinery/plantgenes, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) "bb" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 75e357757354..4965d40bcf5e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -875,6 +875,14 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"akI" = ( +/obj/structure/closet/cabinet, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port) "akS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1432,11 +1440,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/cargo/storage) -"aqa" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/snack, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "aqc" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -1503,6 +1506,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/maintenance/department/eva/abandoned) +"aqF" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/dice, +/obj/effect/spawner/random/entertainment/toy, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "aqS" = ( /obj/structure/bed{ dir = 4 @@ -2113,14 +2122,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/science/circuits) -"awC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "awD" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2343,6 +2344,12 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"azS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) "azW" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -4547,6 +4554,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) +"bcV" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "bdt" = ( /obj/structure/cable, /obj/machinery/power/energy_accumulator/tesla_coil/anchored, @@ -5715,6 +5727,27 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"bqF" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "bqP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8730,13 +8763,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/electronic_marketing_den) -"bYR" = ( -/obj/structure/closet/cabinet, -/obj/effect/spawner/random/food_or_drink/booze, -/obj/effect/spawner/random/food_or_drink/booze, -/obj/effect/spawner/random/food_or_drink/booze, -/turf/open/floor/plating, -/area/station/maintenance/port) "bYV" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -9911,6 +9937,21 @@ }, /turf/open/floor/iron, /area/station/tcommsat/server) +"cnz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "cnE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -10998,6 +11039,23 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"cCE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "cCJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -14148,13 +14206,6 @@ }, /turf/open/floor/iron, /area/station/science/lobby) -"dsj" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/delivery, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron, -/area/station/engineering/main) "dso" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/rnd/server, @@ -16184,7 +16235,6 @@ /area/station/hallway/primary/fore) "dRK" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "dRO" = ( @@ -19926,12 +19976,6 @@ /obj/machinery/coffeemaker/impressa, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"eOF" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "eOL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes/line{ @@ -20169,6 +20213,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"eQJ" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "eQK" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -20693,14 +20742,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"eXN" = ( -/obj/machinery/vending/wardrobe/engi_wardrobe, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "eXW" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall6"; @@ -23912,6 +23953,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"fMn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light_switch/directional/east, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/engineering/main) "fMo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -24675,6 +24732,15 @@ }, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"fXc" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "fXi" = ( /obj/machinery/light/directional/north, /obj/structure/sign/plaques/kiddie/badger{ @@ -24802,6 +24868,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/fore) +"fYe" = ( +/obj/effect/turf_decal/tile/neutral/anticorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/port) "fYh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -25471,15 +25544,25 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/dark, /area/station/science/auxlab/firing_range) +"gfQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/engineering/main) "gfR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) -"gfX" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/deck, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "gga" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -25828,8 +25911,6 @@ /area/station/security/courtroom) "glb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -27283,26 +27364,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"gCn" = ( -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "gCo" = ( /obj/structure/frame/machine{ anchored = 1 @@ -28949,11 +29010,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"gXn" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/dice, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "gXr" = ( /obj/effect/mapping_helpers/dead_body_placer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -29878,12 +29934,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"hjP" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/toy, -/obj/effect/spawner/random/entertainment/toy, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "hjQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -31731,6 +31781,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"hIR" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/effect/spawner/random/entertainment/toy, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "hIU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -32263,6 +32319,22 @@ /obj/structure/reflector/box, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"hQO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hQQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -32608,6 +32680,24 @@ }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) +"hWc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/obj/machinery/modular_computer/console/preset/engineering{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hWh" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -32653,6 +32743,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/aft) +"hWP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hWW" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -32669,12 +32773,6 @@ }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"hXd" = ( -/obj/machinery/light/directional/south, -/obj/machinery/byteforge, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "hXf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -32811,6 +32909,15 @@ }, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) +"hYi" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/dim/directional/south, +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "hYn" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -34366,6 +34473,20 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"iqc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iqd" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -37227,11 +37348,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"jcg" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "jcl" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/structure/sink/directional/east, @@ -39644,6 +39760,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) +"jEo" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/south, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "jEt" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -40134,18 +40257,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) -"jKY" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/camera/directional/south, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ - pixel_x = 5 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "jKZ" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -46876,6 +46987,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/commons/dorms) +"lsj" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/snack, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "lsl" = ( /obj/effect/turf_decal/bot, /obj/item/robot_suit, @@ -46977,10 +47094,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"ltt" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "ltu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -48842,6 +48955,12 @@ }, /turf/open/floor/iron, /area/station/security/lockers) +"lPK" = ( +/obj/effect/turf_decal/tile/neutral/anticorner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) "lPM" = ( /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -50455,6 +50574,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"mmy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "mmM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -52857,6 +52981,18 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +"mOT" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/camera/directional/south, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = 5 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "mPg" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -57969,13 +58105,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"odD" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) "odI" = ( /obj/effect/landmark/start/hangover, /obj/structure/table/wood/poker, @@ -61090,19 +61219,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"oVo" = ( -/obj/structure/cable, -/obj/structure/sign/warning/no_smoking/circle{ - pixel_x = 28; - pixel_y = -28 - }, -/obj/machinery/modular_computer/console/preset/engineering{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "oVp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62288,12 +62404,6 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/carpet/green, /area/station/commons/lounge) -"pky" = ( -/obj/structure/cable, -/obj/machinery/power/smes/engineering, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/circuit/green, -/area/station/engineering/main) "pkA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62364,12 +62474,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"pll" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/port) "pln" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -63277,12 +63381,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/fore) -"pyh" = ( -/obj/structure/chair/office, -/obj/structure/sign/poster/random/directional/north, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "pyq" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -64257,6 +64355,20 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"pJm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/requests_console/directional/south{ + assistance_requestable = 1; + department = "Engineering"; + name = "Engineering Requests Console"; + supplies_requestable = 1 + }, +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/main) "pJo" = ( /obj/structure/cable, /obj/machinery/computer/security/telescreen{ @@ -64954,6 +65066,12 @@ }, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"pQU" = ( +/obj/machinery/light/directional/south, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "pRk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -67141,15 +67259,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"qsv" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/station_alert{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "qsw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -68056,6 +68165,23 @@ }, /turf/open/floor/iron, /area/station/medical/virology) +"qDX" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "qDZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -70151,6 +70277,11 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"rgn" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/port) "rgA" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -73285,14 +73416,6 @@ /obj/effect/spawner/random/trash/soap, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) -"rSG" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "rSJ" = ( /obj/machinery/telecomms/server/presets/engineering, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -75182,14 +75305,12 @@ /turf/open/floor/iron, /area/station/security/warden) "sst" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ssy" = ( @@ -80133,20 +80254,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"tCS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "tCW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -80374,6 +80481,16 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"tFs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "tFG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -81193,6 +81310,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"tPd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "tPk" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/generic_maintenance_landmark, @@ -82015,21 +82139,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"tZa" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console/directional/south{ - assistance_requestable = 1; - department = "Engineering"; - name = "Engineering Requests Console"; - supplies_requestable = 1 - }, -/obj/structure/sign/poster/official/do_not_question{ - pixel_x = 32 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/engineering/main) "tZi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84357,11 +84466,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"uCq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/loafer, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "uCt" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 1 @@ -87523,10 +87627,6 @@ /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "vrs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -87546,6 +87646,13 @@ /obj/item/taperecorder, /turf/open/floor/iron/dark, /area/station/security/office) +"vrF" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/iron, +/area/station/maintenance/port) "vrJ" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -87912,6 +88019,17 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"vvU" = ( +/obj/structure/sign/warning/no_smoking/circle{ + pixel_x = 28; + pixel_y = -28 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "vwa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -88602,21 +88720,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"vDj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/line, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/holopad, -/turf/open/floor/iron/dark/textured_large, -/area/station/bitrunning/den) "vDm" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -89576,11 +89679,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/security/prison/garden) -"vRy" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "vRB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91754,12 +91852,6 @@ /obj/machinery/iv_drip, /turf/open/floor/iron, /area/station/medical/virology) -"wpW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "wqk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -92471,6 +92563,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wxF" = ( +/obj/structure/chair/office, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "wxI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -99178,12 +99275,6 @@ /obj/item/hand_labeler, /turf/open/floor/plating, /area/station/maintenance/port) -"yix" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port) "yiA" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red{ @@ -99262,11 +99353,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark/smooth_large, /area/station/science/genetics) -"yjV" = ( -/obj/structure/chair/office, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "ykb" = ( /obj/structure/table, /obj/item/storage/bag/plants/portaseeder, @@ -99429,6 +99515,15 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"ylS" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) "ylT" = ( /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/brown{ @@ -119399,8 +119494,8 @@ tqa gnw lFQ mWF -jcg -jcg +mWF +mWF sst pgY gAw @@ -119658,7 +119753,7 @@ sHT glb dRK wcP -yeO +fXc nbZ gAw ifw @@ -125558,7 +125653,7 @@ gRE bEN ogj jaZ -eXN +ogj tqo grl iJU @@ -125815,7 +125910,7 @@ cui kpD vvH hcQ -dsj +eQJ rRD pgA hOa @@ -126071,8 +126166,8 @@ eOe bTN pWd geR -odD -tZa +ylS +pJm rRD adb odL @@ -126840,7 +126935,7 @@ slp aJu iSi mQF -qsv +jEo pTC lsf uGP @@ -127094,10 +127189,10 @@ rAH kdd gzF wGA -pky -tCS -gCn -oVo +aJu +tFs +hQO +vvU pTC goD sjH @@ -127351,10 +127446,10 @@ wGA wGA wGA wGA -pTC -pTC -pTC -gXx +gfQ +cCE +hWP +iqc pTC vcB eru @@ -127607,14 +127702,14 @@ emB hza ejp hza -quQ -vcB -lmJ -qVA -qAR -qev -yix -pps +pPy +fMn +bqF +qDX +hWc +pTC +lPK +fYe pTC qNN req @@ -127864,14 +127959,14 @@ opq rrw fAX tAh -crT -xhw -fBp -miM -uiM -rQi -qzu -cOt +pPy +pTC +pTC +pTC +gXx +pTC +vrF +rgn pTC pFP pFP @@ -128121,14 +128216,14 @@ svI oEV sOM tFa -bPD -vcB -vcB -vcB -vcB +quQ vcB -qcM -cOt +lmJ +qVA +qAR +qev +azS +pps pTC jVS nED @@ -128378,14 +128473,14 @@ vBX dsy nps nps -vcB -vcB -dGQ -caW -bYR -vcB -jPf +crT +xhw +fBp +miM +uiM rQi +qzu +cOt pTC rnr lRx @@ -128635,12 +128730,12 @@ dGS slx uED fdJ +bPD +vcB +vcB +vcB +vcB vcB -qcM -ieM -iMH -gnW -ofk lhZ rQi pTC @@ -128893,14 +128988,14 @@ iCO uED ozx vcB -jtp -aqa -iPb -kCi +vcB +dGQ +caW +akI vcB lbX pgV -pll +jTw jTw lvI pxo @@ -129150,11 +129245,11 @@ iCO uED nXK vcB -pyh -hjP -eOF -awC -vcB +qcM +ieM +iMH +gnW +ofk qcM win vcB @@ -129407,10 +129502,10 @@ iCO axQ ilo vcB -yjV -gfX -rSG -qcM +jtp +lsj +iPb +kCi vcB jPf ant @@ -129664,10 +129759,10 @@ kAS uED nXK vcB -jtp -gXn -vRy -kCi +wxF +aqF +hIR +hYi vcB lbX pps @@ -129924,7 +130019,7 @@ rIU pSL nsH lbS -wpW +tPd vcB mYM iAM @@ -130178,7 +130273,7 @@ rRr uED nXK vcB -ltt +bcV hRs grA pTC @@ -143518,7 +143613,7 @@ pxS xMZ mlF qsF -jKY +mOT mdR lDY tpZ @@ -143774,8 +143869,8 @@ llj rer xMZ mDm -vDj -hXd +cnz +pQU mdR qmT tpZ @@ -151773,7 +151868,7 @@ adM uHP dth fws -uCq +mmy rYA vHY hie diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 6b007c1a8d5c..da1b6abbeb71 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -497,17 +497,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron, /area/station/commons/dorms) -"akL" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/small/directional/west, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "akQ" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/glass/reinforced/icemoon, @@ -7051,7 +7040,6 @@ "cks" = ( /obj/item/wrench, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -8806,6 +8794,17 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"cKR" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "cLo" = ( /obj/machinery/recharge_station, /turf/open/floor/iron, @@ -14683,9 +14682,7 @@ /area/station/commons/fitness) "eDC" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "eDM" = ( @@ -19750,16 +19747,6 @@ /obj/item/circuitboard/machine/chem_master, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"gmR" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/structure/reagent_dispensers/fueltank/large, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "gmW" = ( /turf/closed/wall, /area/station/commons/fitness) @@ -28978,6 +28965,10 @@ "jre" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) +"jrj" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) "jrk" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/broken_floor, @@ -30105,13 +30096,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/production) -"jLk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/loafer, -/turf/open/floor/plating, -/area/station/security/prison/safe) "jLl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/effect/turf_decal/siding/yellow{ @@ -31606,6 +31590,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"kit" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "kix" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Base" @@ -31968,10 +31956,6 @@ }, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) -"kpn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "kpp" = ( /obj/structure/table/wood, /obj/item/storage/box/matches, @@ -43622,10 +43606,6 @@ /area/station/security/prison/safe) "nXl" = ( /obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nXn" = ( @@ -47552,6 +47532,14 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"pkv" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "pkM" = ( /obj/machinery/light/directional/south, /obj/effect/landmark/start/hangover, @@ -47640,14 +47628,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) -"pmQ" = ( -/obj/machinery/light_switch/directional/west, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/byteforge, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "pna" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -50644,6 +50624,16 @@ /obj/structure/closet/crate, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"qlX" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "qmi" = ( /turf/open/floor/iron, /area/station/cargo/lobby) @@ -54081,13 +54071,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"rqF" = ( -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "Secure Storage" - }, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "rqH" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/leather, @@ -57139,6 +57122,24 @@ "sqt" = ( /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"sqv" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "Secure Storage" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"sqL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "sqN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58183,10 +58184,6 @@ /area/mine/living_quarters) "sGJ" = ( /obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -58942,6 +58939,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"sVa" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/engine_smes) "sVf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64304,9 +64307,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "uIV" = ( -/obj/machinery/meter, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "uJn" = ( @@ -64845,6 +64846,13 @@ dir = 1 }, /area/station/engineering/main) +"uSM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/security/prison/safe) "uTc" = ( /obj/machinery/chem_heater/withbuffer, /obj/structure/window/reinforced/spawner/directional/north{ @@ -74053,6 +74061,10 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/security/prison/visit) +"xMC" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/engineering/engine_smes) "xMI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -170912,7 +170924,7 @@ wRa vVH nRO ulz -jLk +uSM ulz pNm eOz @@ -227776,8 +227788,8 @@ gjP ajw ajw aKb -pmQ -kpn +pkv +kit uAS ehu tFP @@ -232688,7 +232700,7 @@ xYI mNY oXX mNY -hpd +jrj hpd hpd wkw @@ -232945,9 +232957,9 @@ csT mNY kCn mNY -yaL -rqF -rqF +xMC +sqv +sqv yaL yaL yaL @@ -233202,8 +233214,8 @@ kYq mNY kCn mNY -akL -tvF +cKR +sVa tvF izF gTK @@ -233459,8 +233471,8 @@ wmM mNY kCn mNY -gmR -tMD +qlX +sqL rMG lui twt diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ba8eeab1e3ab..0d9854711b40 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3434,12 +3434,6 @@ /obj/item/reagent_containers/cup/rag, /turf/open/floor/iron/white, /area/station/medical/abandoned) -"bje" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "bjB" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -4982,6 +4976,7 @@ /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, /turf/open/floor/plating, /area/station/maintenance/port/fore) "bMY" = ( @@ -5255,12 +5250,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/medical/storage) -"bSY" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "bTj" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -5702,10 +5691,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"ceD" = ( -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "ceF" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/circuit/telecomms/mainframe, @@ -7403,10 +7388,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"cML" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall, -/area/station/maintenance/starboard/fore) "cMQ" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopqueue"; @@ -7561,12 +7542,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"cPQ" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "cPT" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -9673,16 +9648,6 @@ /obj/structure/sign/departments/telecomms/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"dHg" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_alert, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "dHG" = ( /obj/machinery/atmospherics/components/binary/crystallizer{ dir = 4 @@ -15781,6 +15746,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison) +"fYa" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "fYb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -16603,6 +16574,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"gmR" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/modular_computer/console/preset/engineering, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "gmS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -17845,15 +17823,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"gLo" = ( -/obj/machinery/power/terminal, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "gLy" = ( /obj/machinery/portable_atmospherics/pump/lil_pump, /obj/effect/turf_decal/siding/purple{ @@ -17943,15 +17912,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"gMG" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Power Monitoring" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/station_alert, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "gMO" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -19581,6 +19541,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"hps" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Power Monitoring" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hpv" = ( /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -20968,6 +20937,16 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"hRA" = ( +/obj/structure/sign/warning/electric_shock{ + pixel_x = -31 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) "hRD" = ( /obj/structure/chair/office{ dir = 4 @@ -22208,6 +22187,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"imV" = ( +/obj/structure/easel, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "inp" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -23570,6 +23553,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) +"iIC" = ( +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/station_alert, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iIP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24409,6 +24402,13 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"iSq" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iSI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -25370,6 +25370,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"jjU" = ( +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/atmos_alert, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "jkj" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -29228,18 +29238,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/command/teleporter) -"kCq" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/modular_computer/console/preset/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "kCC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -29475,14 +29473,6 @@ /obj/effect/landmark/start/bitrunner, /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) -"kHU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/byteforge, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "kIG" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -32842,6 +32832,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"lRG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "lRS" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -33096,6 +33095,11 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"lVE" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "lVH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -38853,11 +38857,6 @@ /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/wood, /area/station/maintenance/port/aft) -"nXT" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/easel, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "nYa" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -39338,13 +39337,6 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"ofk" = ( -/obj/machinery/light_switch/directional/west, -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "ofQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -39666,10 +39658,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"omE" = ( -/obj/effect/spawner/random/loafer, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "omF" = ( /obj/machinery/teleport/station, /obj/machinery/status_display/evac/directional/north, @@ -41257,6 +41245,11 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"oQb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "oQc" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for the Auxiliary Mining Base."; @@ -42238,6 +42231,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"piQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "piT" = ( /obj/structure/rack, /obj/item/reagent_containers/cup/bottle/epinephrine{ @@ -42923,6 +42924,12 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) +"pvX" = ( +/obj/machinery/power/terminal, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/engineering/main) "pvY" = ( /obj/machinery/camera/directional/north{ c_tag = "Holodeck - Fore"; @@ -48265,6 +48272,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"rtu" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "rtG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -48598,6 +48611,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ryc" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/power/terminal, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "ryf" = ( /obj/structure/bookcase/random/reference, /obj/effect/turf_decal/siding/wood{ @@ -49830,6 +49852,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"rRY" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/engineering/main) "rRZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -53062,17 +53088,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"sXe" = ( -/obj/effect/landmark/start/station_engineer, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/electric_shock{ - pixel_x = -31 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "sXq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -53306,6 +53321,7 @@ /obj/effect/turf_decal/bot, /obj/structure/sink/directional/west, /obj/structure/sign/poster/random/directional/south, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron, /area/station/service/hydroponics) "tck" = ( @@ -60605,6 +60621,13 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"vEF" = ( +/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "vEH" = ( /obj/machinery/door/window/right/directional/east{ name = "Danger: Conveyor Access"; @@ -60930,11 +60953,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"vKm" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "vKt" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/sign/painting/library_secure{ @@ -64698,6 +64716,13 @@ /obj/effect/mapping_helpers/mail_sorting/service/bar, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"xcR" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -67313,6 +67338,10 @@ /obj/structure/mirror/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"xZv" = ( +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "xZx" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -67606,6 +67635,12 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"yen" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "yeq" = ( /obj/machinery/conveyor{ dir = 1; @@ -85051,7 +85086,7 @@ dHa ugJ edP jXu -bje +yen pII ttG oBV @@ -85308,7 +85343,7 @@ cTQ xte mzs jXu -kHU +piQ boz pPV pPV @@ -90444,7 +90479,7 @@ aaa bxr jXu rOz -omE +xZv siY jXu aaa @@ -106139,12 +106174,12 @@ eBn qXB fwG ldO -vKm -tbd -cPQ -nXT -wyG -qXB +oQb +psZ +mSB +psZ +edC +psZ psZ qXB ttA @@ -106390,19 +106425,19 @@ lCN kbo psZ psZ -bSY +xcR kbo kbo eqt psZ psZ ckX -psZ -mSB -edC -psZ -psZ -psZ +uXd +rRY +uXd +uXd +rRY +uXd qXB gAU kQD @@ -106654,12 +106689,12 @@ tCS tCS tCS tCS -tCS -cML -tCS -tCS -cML -tCS +uXd +gmR +hRA +ryc +iSq +uXd tCS sqE sqE @@ -106912,10 +106947,10 @@ tfg ssI ssI uXd -kCq -sXe -gLo -ofk +jjU +vEF +pvX +fYa uXd fDL hSt @@ -107169,10 +107204,10 @@ tfg ssI mBw uXd -dHg +iIC gLK qul -acs +fYa uXd tKS nLz @@ -107410,7 +107445,7 @@ qXB dOx jCw jCw -jCw +lVE qXB lOK jcy @@ -107426,7 +107461,7 @@ bYp gXu oaC uXd -gMG +hps dWG uGm acs @@ -107924,10 +107959,10 @@ qXB oPZ wha jRz -ceD +rtu qXB cgL -wrn +imV tCS mHe wYx @@ -108183,7 +108218,7 @@ qXB qXB qXB qXB -igz +lRG tCS tCS cnK diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 46bd3d26ba58..cad8ebc23cf1 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -6790,11 +6790,9 @@ /turf/closed/wall/r_wall, /area/station/security/checkpoint) "bDO" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4 - }, /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bDU" = ( @@ -47245,10 +47243,6 @@ /turf/open/floor/iron/textured_large, /area/station/cargo/miningoffice) "mvg" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/machinery/camera{ c_tag = "Supermatter Foyer Cam #4"; network = list("ss13","engine") @@ -83315,13 +83309,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"wfl" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "wfx" = ( /obj/machinery/door/window/brigdoor/left/directional/west, /obj/structure/cable, @@ -138400,8 +138387,8 @@ vap lQD juf klY -kfo -wfl +xgW +xgW dEc uhx uov @@ -138657,7 +138644,7 @@ uyD uyD uyD bDO -kfo +xgW mvg dEc ggX diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index f9a8b3659bb1..43f650e8616a 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -605,7 +605,7 @@ pixel_y = 1 }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "anP" = ( /obj/effect/turf_decal/trimline/yellow, /turf/open/floor/iron/dark/textured, @@ -865,7 +865,7 @@ }, /obj/machinery/vending/wallmed/directional/west, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "avO" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 @@ -1024,7 +1024,7 @@ /obj/effect/turf_decal/trimline/blue/line, /obj/machinery/light/directional/north, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "aCp" = ( /mob/living/basic/butterfly, /obj/structure/cable, @@ -1335,7 +1335,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "aKV" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/gambling, @@ -1919,7 +1919,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "aZB" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/engine, @@ -2776,6 +2776,9 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/captain/private) +"bxs" = ( +/turf/closed/wall/r_wall, +/area/station/medical/psychology) "bxM" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -3960,6 +3963,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) +"bZY" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/structure/closet/crate/decorations, +/obj/effect/turf_decal/bot, +/obj/item/lightreplacer, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "caj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -4000,11 +4012,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"cbM" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/cable/industrial, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "cbS" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, @@ -4357,7 +4364,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "clC" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/egg_incubator, @@ -4600,7 +4607,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "cvu" = ( /obj/structure/sink/kitchen/directional/east, /turf/open/floor/iron/kitchen, @@ -5320,7 +5327,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "cQM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5433,33 +5440,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"cSD" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Chief Engineer's Office" - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_corner{ - dir = 8 - }, -/area/station/engineering/break_room) "cSR" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron, @@ -5725,6 +5705,36 @@ /obj/effect/spawner/random/structure/closet_private, /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) +"dbE" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Engineer's Office" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/effect/turf_decal/bot, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 14 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 8 + }, +/area/station/engineering/break_room) "dbI" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment, @@ -5911,7 +5921,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plating, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "dgu" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -5968,7 +5978,7 @@ }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dhA" = ( /obj/machinery/modular_computer/console/preset/id, /obj/machinery/light/directional/north, @@ -6219,18 +6229,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"dnj" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/item/lightreplacer, -/obj/item/construction/plumbing/engineering, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "dnm" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/trimline/green/line{ @@ -7022,7 +7020,7 @@ "dHt" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/stairs, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "dHJ" = ( /obj/structure/cable, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, @@ -7155,7 +7153,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dMc" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/power/apc/auto_name/directional/north, @@ -7291,7 +7289,7 @@ dir = 6 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "dPe" = ( /obj/machinery/grill, /obj/item/stack/sheet/mineral/coal/ten, @@ -7322,7 +7320,7 @@ dir = 1 }, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dQd" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -7361,7 +7359,7 @@ name = "Mender Moff" }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "dRJ" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, @@ -7588,7 +7586,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dXN" = ( /obj/machinery/status_display/ai, /obj/structure/table/glass, @@ -7643,7 +7641,7 @@ dir = 1 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dZk" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/mineral/titanium, @@ -7804,7 +7802,7 @@ }, /obj/effect/turf_decal/trimline/blue/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ecC" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -8197,6 +8195,17 @@ /obj/structure/cable, /turf/open/floor/iron/stairs, /area/station/cargo/warehouse/upper) +"eoY" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/engineering/main) "epb" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/camera/autoname/directional/south, @@ -8287,7 +8296,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eqO" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8356,7 +8365,7 @@ }, /obj/machinery/stasis, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "esh" = ( /obj/structure/toilet{ dir = 4 @@ -8836,7 +8845,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eDZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, @@ -8922,11 +8931,6 @@ dir = 1 }, /area/station/science/lobby) -"eGh" = ( -/obj/machinery/byteforge, -/obj/effect/turf_decal/box, -/turf/open/floor/carpet/neon/simple/orange/nodots, -/area/station/bitrunning/den) "eGI" = ( /obj/machinery/rnd/production/protolathe/department/science, /obj/effect/turf_decal/siding/purple, @@ -9078,7 +9082,7 @@ /area/station/security/office) "eJv" = ( /turf/closed/wall/r_wall, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eJV" = ( /obj/structure/cable/industrial, /turf/open/floor/plating, @@ -9633,7 +9637,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "eXV" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -10506,7 +10510,7 @@ "fvF" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "fvN" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -11883,7 +11887,7 @@ }, /obj/item/bedsheet/medical, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "gcz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -12005,7 +12009,7 @@ "gfV" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "ggj" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/white/filled/warning{ @@ -12505,6 +12509,17 @@ /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"gwM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/engineering/main) "gwO" = ( /turf/closed/wall/r_wall, /area/station/medical/medbay/lobby) @@ -12604,7 +12619,7 @@ /obj/structure/drain, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "gzE" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/white/line{ @@ -12981,7 +12996,7 @@ }, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "gJV" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, @@ -13166,7 +13181,7 @@ name = "Psychology Office Fax Machine" }, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "gQC" = ( /obj/effect/gibspawner/xeno/bodypartless, /obj/structure/spider/stickyweb, @@ -14879,7 +14894,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "hJu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15467,7 +15482,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "hXz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -15509,6 +15524,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/main) +"hYO" = ( +/turf/closed/wall, +/area/station/medical/medbay/aft) "hZe" = ( /obj/docking_port/stationary{ dir = 4; @@ -15803,7 +15821,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ihB" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -15879,7 +15897,7 @@ cycle_id = "medbay_lobby" }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ijM" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/trimline/yellow/filled/corner, @@ -15970,7 +15988,7 @@ }, /obj/item/kirbyplants/random, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "imq" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -16073,7 +16091,7 @@ "ipa" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ipf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -16319,7 +16337,7 @@ /area/station/commons/lounge) "iut" = ( /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "iuY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -17233,6 +17251,12 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) +"iWk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "iWl" = ( /obj/machinery/vending/wardrobe/science_wardrobe, /obj/effect/turf_decal/tile/purple/opposingcorners{ @@ -17713,7 +17737,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "jiZ" = ( /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, @@ -17738,7 +17762,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "jjp" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -17808,9 +17832,6 @@ pixel_x = 5; pixel_y = 7 }, -/obj/item/assembly/flash, -/obj/item/assembly/flash, -/obj/item/assembly/flash, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -17819,6 +17840,18 @@ }, /obj/item/book/manual/wiki/experimentor, /obj/item/book/manual/wiki/robotics_cyborgs, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, /turf/open/floor/noslip{ icon_state = "textured_white"; color = "#D381C9" @@ -18046,7 +18079,7 @@ /obj/machinery/airalarm/directional/west, /obj/machinery/camera/directional/west, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "jtn" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -18993,7 +19026,7 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "jPB" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -19534,14 +19567,6 @@ "kcP" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) -"kda" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/structure/closet/crate/decorations, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "kdi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -21599,6 +21624,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) +"lbf" = ( +/obj/structure/cable/industrial, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/main) "lbi" = ( /obj/effect/turf_decal/trimline/brown/corner, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -21772,7 +21804,7 @@ dir = 2 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lgp" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -22014,7 +22046,7 @@ dir = 8 }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "lms" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -22569,7 +22601,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "lAP" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, /obj/machinery/light/floor/has_bulb, @@ -22644,7 +22676,7 @@ /obj/structure/sign/departments/chemistry/pharmacy, /obj/machinery/vending/drugs, /turf/closed/wall/r_wall, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "lCD" = ( /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, @@ -22994,7 +23026,7 @@ cycle_id = "medbay_lobby" }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lJE" = ( /obj/structure/table/glass/plasmaglass, /obj/item/electronics/airlock, @@ -23097,7 +23129,7 @@ /obj/effect/turf_decal/trimline/blue/corner, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lMo" = ( /obj/structure/window/spawner/directional/south, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ @@ -23880,7 +23912,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mkv" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -24573,7 +24605,7 @@ /obj/structure/chair/sofa/left/brown, /obj/machinery/light_switch/directional/north, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "mBG" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/south{ @@ -24698,7 +24730,7 @@ /area/station/hallway/primary/central/fore) "mFK" = ( /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mFX" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/entertainment/arcade, @@ -24866,7 +24898,7 @@ }, /obj/machinery/iv_drip, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "mJW" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -25235,7 +25267,7 @@ /obj/structure/drain, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mTy" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/portable_atmospherics/scrubber, @@ -25920,7 +25952,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "niT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -26164,7 +26196,7 @@ /area/station/cargo/storage) "noF" = ( /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "noG" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -26303,7 +26335,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "nsX" = ( /obj/effect/turf_decal/stripes{ dir = 5 @@ -26386,7 +26418,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "nuD" = ( /obj/machinery/computer/scan_consolenew, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -26468,7 +26500,7 @@ }, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "nwW" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -26888,7 +26920,7 @@ }, /obj/effect/turf_decal/trimline/blue/line, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "nGD" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -27571,6 +27603,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"obz" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating, +/area/station/engineering/main) "obQ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -28124,7 +28161,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "onJ" = ( /obj/machinery/vending/mechcomp, /obj/effect/turf_decal/tile/purple/opposingcorners{ @@ -28365,7 +28402,7 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, /obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "otz" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -28676,7 +28713,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "ozV" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, @@ -28989,7 +29026,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "oKD" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -29018,7 +29055,7 @@ "oMo" = ( /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "oMw" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -29633,7 +29670,7 @@ "pfg" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pfl" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/disposal/bin{ @@ -29818,7 +29855,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pjg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -30239,7 +30276,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "pse" = ( /obj/structure/table/wood, /obj/machinery/camera/autoname/directional/south, @@ -30722,7 +30759,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pHe" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -30850,7 +30887,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "pIW" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -31046,7 +31083,7 @@ /obj/effect/landmark/start/psychologist, /obj/structure/chair/office/light, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pNB" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -31173,15 +31210,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"pPD" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/structure/closet/crate/rcd, -/obj/effect/turf_decal/bot, -/obj/machinery/light/no_nightlight/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "pPR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31901,7 +31929,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "qhu" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -32494,7 +32522,7 @@ dir = 2 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "qvJ" = ( /obj/machinery/computer/rdconsole{ dir = 8 @@ -32820,7 +32848,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "qGV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33296,7 +33324,7 @@ }, /obj/item/storage/belt/medical, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "qRY" = ( /turf/closed/wall, /area/station/cargo/miningoffice) @@ -33463,13 +33491,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) -"qWq" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "qWx" = ( /obj/structure/table/wood, /obj/structure/desk_bell{ @@ -34358,7 +34379,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rtr" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/portable_atmospherics/pump, @@ -34464,9 +34485,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"rwd" = ( -/turf/open/floor/carpet/neon/simple/orange/nodots, -/area/station/bitrunning/den) "rwi" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -34565,7 +34583,7 @@ }, /obj/machinery/stasis, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rzB" = ( /obj/effect/landmark/start/bartender, /obj/machinery/light/floor/has_bulb, @@ -34785,7 +34803,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/curtain, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rEC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34886,7 +34904,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rHY" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -34898,7 +34916,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "rIh" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -35062,7 +35080,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/stairs, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "rLb" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -35142,7 +35160,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "rNz" = ( /obj/machinery/door/airlock/security{ name = "Detective's Office" @@ -35501,6 +35519,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"rVE" = ( +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/carpet/neon/simple/orange/nodots, +/area/station/bitrunning/den) "rWm" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/trimline/brown, @@ -35591,7 +35614,7 @@ }, /obj/structure/bookcase/random/reference, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "rZw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct/industrial/waste, @@ -35835,11 +35858,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"sgQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/glass/reinforced, -/area/station/engineering/main) "shh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -36526,7 +36544,7 @@ }, /obj/machinery/iv_drip, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "sAA" = ( /obj/structure/cable/industrial, /turf/open/floor/iron/stairs, @@ -36545,7 +36563,7 @@ dir = 9 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "sBe" = ( /obj/structure/table/wood, /obj/item/food/ready_donk/mac_n_cheese, @@ -37345,7 +37363,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "sVF" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37557,6 +37575,9 @@ /obj/structure/railing, /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) +"tdm" = ( +/turf/open/floor/carpet/neon/simple/orange/nodots, +/area/station/bitrunning/den) "tdt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38092,6 +38113,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/mapping_helpers/airlock/access/any/medical, /obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/mapping_helpers/airlock/access/any/medical, /turf/open/floor/iron/white/textured, /area/station/science/genetics) "tuT" = ( @@ -38128,7 +38150,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "tvt" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38390,7 +38412,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "tCm" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 9 @@ -39551,7 +39573,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ueN" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -39703,7 +39725,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured_large, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uhr" = ( /obj/structure/cable, /obj/structure/table, @@ -39723,7 +39745,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "uhB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40435,7 +40457,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uAJ" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -40882,7 +40904,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "uKT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41011,7 +41033,7 @@ dir = 8 }, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uNu" = ( /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment, @@ -41044,7 +41066,7 @@ "uOF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uOL" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -41126,7 +41148,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth, /turf/open/floor/plating, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "uQJ" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, @@ -41642,7 +41664,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vcU" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -42186,15 +42208,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/office) -"voC" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/structure/closet/crate/engineering, -/obj/effect/turf_decal/bot, -/obj/item/construction/plumbing/engineering, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "voJ" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 1 @@ -42237,6 +42250,17 @@ }, /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) +"vqH" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/closet/crate/rcd, +/obj/effect/turf_decal/bot, +/obj/machinery/light/no_nightlight/directional/east, +/obj/item/construction/plumbing/engineering, +/obj/item/construction/plumbing/engineering, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "vrg" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -42696,7 +42720,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "vCo" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -43035,7 +43059,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/sign/warning/no_smoking, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vOg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43277,7 +43301,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vUu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43907,7 +43931,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43923,7 +43947,7 @@ /obj/machinery/duct/industrial/waste, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wiK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -44300,7 +44324,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "wtT" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -44312,7 +44336,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/medical_kiosk, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wuf" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -44651,7 +44675,7 @@ }, /obj/machinery/light/directional/east, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wCJ" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable, @@ -44996,7 +45020,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "wOu" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/vending/wardrobe/jani_wardrobe, @@ -45355,6 +45379,13 @@ /obj/item/crowbar, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +"wXh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet/crate/decorations, +/obj/effect/turf_decal/bot, +/turf/open/floor/glass/reinforced, +/area/station/engineering/main) "wXn" = ( /obj/machinery/suit_storage_unit/mining, /obj/structure/disposalpipe/segment{ @@ -45407,7 +45438,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wYo" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/item/restraints/legcuffs/beartrap, @@ -45475,7 +45506,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wZW" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/firedoor, @@ -46090,7 +46121,7 @@ }, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "xoP" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -46860,7 +46891,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "xGf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46886,7 +46917,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xGC" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, @@ -47277,7 +47308,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xPG" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -47616,9 +47647,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) -"xXa" = ( -/turf/closed/wall, -/area/station/medical/treatment_center) "xXz" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -47672,7 +47700,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xZC" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/cable, @@ -47976,7 +48004,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "yhu" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -68634,8 +68662,8 @@ kXk iSl wUo btg -rwd -eGh +tdm +rVE pEa wsx twN @@ -72411,11 +72439,11 @@ nRM fiw mFh fgS -eJv -eJv -eJv +bxs +bxs +bxs dgc -eJv +bxs hoz mbj qlJ @@ -72667,8 +72695,8 @@ obQ ykG kLL fgS -eJv -eJv +bxs +bxs rZp jth iut @@ -72930,7 +72958,7 @@ noF nuB pNw pHc -ols +hYO mJm jiC rNm @@ -73181,7 +73209,7 @@ fiw fgS tAk fgS -eJv +bxs mBv noF uKC @@ -73438,7 +73466,7 @@ fiw fgS mFh tAk -eJv +bxs anf lmd gJS @@ -73695,7 +73723,7 @@ hrC mFh fgS mFh -eJv +bxs gQq pjd nwz @@ -77049,11 +77077,11 @@ dvQ nhC nhC tBQ -xXa +ols uhh eXH -xXa -xXa +ols +ols nqU bKh xoE @@ -78851,8 +78879,8 @@ gct rzA vUo esa -xXa -xXa +ols +ols vSw pqz adf @@ -87116,7 +87144,7 @@ gdp rmm pZA gdp -cSD +dbE xXz nfg gdp @@ -88656,13 +88684,13 @@ xQn eMG tCB bQC -sgQ +wXh asg ssb -dnj cpM yab cTW +eoY jZd pHe jZd @@ -88916,13 +88944,13 @@ eXg qSp jbU sCq -rvE xyp eIg aFk weN weN weN +weN bOT hNe ijg @@ -89173,10 +89201,10 @@ hvh wUb yam sCq -qWq -lSE +iWk eIg qqf +obz fKr fKr fKr @@ -89430,10 +89458,10 @@ fFQ jvI poH auZ -cbM xKz sAA aBO +lbf ghz ghz ghz @@ -89687,11 +89715,11 @@ dnr jvI cME rvE -rvE dLS eIg huL hUd +hUd trB hUd njm @@ -89942,12 +89970,12 @@ fAb kdz wBn jvI -pPD +vqH iBn -kda -voC +bZY yab pVp +gwM wPi mty kKW diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 224e6319e2d6..ff2d9da84987 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2588,6 +2588,10 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"ls" = ( +/obj/machinery/telecomms/allinone/nuclear, +/turf/open/floor/circuit/red/telecomms, +/area/centcom/central_command_areas/admin) "lu" = ( /obj/structure/railing/wood{ dir = 1 @@ -2748,6 +2752,16 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mj" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/white/herringbone, +/area/centcom/central_command_areas/kitchen) "mk" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -3706,15 +3720,11 @@ "qz" = ( /obj/item/storage/backpack/duffelbag/med/surgery, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) "qD" = ( /obj/structure/table/reinforced, -/obj/machinery/infuser, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) "qE" = ( @@ -4949,6 +4959,7 @@ /area/centcom/central_command_areas/medical) "vT" = ( /obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/chem_heater/debug, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) "vW" = ( @@ -6359,6 +6370,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"Bq" = ( +/obj/machinery/vending/medical, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/medical) "Br" = ( /obj/structure/railing/wood{ dir = 8 @@ -6701,6 +6716,7 @@ /area/centcom/central_command_areas/admin_hangout) "Dr" = ( /obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) "Dt" = ( @@ -10944,6 +10960,12 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"UH" = ( +/obj/structure/railing/wood, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "UI" = ( /obj/effect/turf_decal/siding/green{ dir = 4 @@ -11914,6 +11936,7 @@ /obj/structure/table/reinforced, /obj/item/knife, /obj/item/knife, +/obj/item/kitchen/rollingpin, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/kitchen) "Zb" = ( @@ -43169,7 +43192,7 @@ oJ lo oM iF -aa +ls On On GZ @@ -54194,7 +54217,7 @@ mQ mQ Rm Ac -RN +mj Nx ZX mQ @@ -59594,7 +59617,7 @@ Nb FV dl Nb -Ca +UH ux vS vT @@ -59849,7 +59872,7 @@ fE AO fE we -we +Bq Nb YL Wv diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8d1720b38750..029c4c200388 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -149,7 +149,7 @@ /area/station/security/prison/safe) "aaA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "aaB" = ( /obj/structure/table, @@ -711,6 +711,8 @@ dir = 9 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "ach" = ( @@ -848,8 +850,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/open/floor/iron, /area/station/escapepodbay) @@ -945,12 +947,12 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/white/full, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/escapepodbay) "acP" = ( @@ -2165,14 +2167,10 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/disposal) "agt" = ( -/obj/structure/table/glass, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Common Channel"; - pixel_x = 0 +/obj/machinery/computer/old{ + dir = 8 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "agu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -2198,7 +2196,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "agw" = ( @@ -2224,20 +2221,13 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/under/syndicate, /obj/item/clothing/under/misc/syndicate_souvenir, -/obj/item/nullrod/clown, -/obj/item/clothing/mask/gas/clown_hat, -/obj/item/clothing/shoes/clown_shoes, -/obj/item/clothing/under/rank/civilian/clown/magic{ - name = "clown suit" - }, -/obj/item/storage/secure/safe/directional/north, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "agx" = ( /obj/structure/filingcabinet, /obj/structure/window/spawner/directional/north, /obj/item/paper/crumpled, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "agy" = ( /obj/structure/alien/weeds, @@ -2248,7 +2238,7 @@ /obj/structure/chair/comfy/carp{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "agA" = ( /obj/effect/turf_decal/sand/plating, @@ -2299,12 +2289,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "agG" = ( /obj/structure/dresser, /obj/item/clothing/mask/cigarette/cigar/havana, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "agH" = ( /obj/machinery/power/apc/auto_name/directional/west, @@ -3770,7 +3760,7 @@ /area/station/cargo/miningdock/cafeteria) "atl" = ( /obj/structure/hoop, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "atC" = ( /obj/effect/decal/cleanable/dirt, @@ -4713,18 +4703,7 @@ /turf/open/floor/plating, /area/station/command/teleporter) "aBI" = ( -/obj/structure/table/glass, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 0 - }, -/obj/item/toy/figure/clown{ - pixel_x = 8; - pixel_y = 16 - }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "aBK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6672,7 +6651,7 @@ /area/station/command/heads_quarters/cmo) "aQh" = ( /obj/machinery/light/directional/east, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "aQj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -7732,7 +7711,7 @@ /area/station/medical/medbay/central) "bhG" = ( /obj/machinery/door/airlock/bananium, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "bhK" = ( /obj/structure/curtain, @@ -7981,9 +7960,6 @@ /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/structure/window/spawner/directional/west, /obj/item/toy/plush/goatplushie, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/food/grown/banana, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "bmb" = ( @@ -8602,10 +8578,14 @@ /area/station/science/lower) "bxd" = ( /obj/structure/sign/calendar/directional/south, -/obj/machinery/computer/old{ - dir = 1 +/obj/structure/table/glass, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_x = 0 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "bxr" = ( /obj/effect/decal/cleanable/dirt, @@ -9407,6 +9387,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "bJP" = ( @@ -9774,6 +9756,18 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) +"bPp" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "bPq" = ( /obj/effect/turf_decal/trimline/neutral/warning, /turf/open/floor/iron/dark, @@ -9917,7 +9911,7 @@ "bSM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light_switch/directional/south, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "bSS" = ( /obj/effect/spawner/structure/window, @@ -10081,6 +10075,13 @@ dir = 8 }, /area/station/command/bridge) +"bVn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "bVs" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -11260,13 +11261,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) "cmx" = ( -/obj/effect/decal/cleanable/confetti, /obj/machinery/button/door/directional/south{ req_access = "theatre"; id_tag = "honkbunker"; name = "Deadbolt" }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "cmH" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -11619,6 +11619,8 @@ dir = 4 }, /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/engineering/atmos) "csR" = ( @@ -11639,6 +11641,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ctg" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/central/greater) "ctW" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -11875,6 +11889,14 @@ /obj/item/storage/box/lights/tubes, /turf/open/floor/iron, /area/station/service/janitor) +"cxM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/valve/digital/layer2{ + name = "Chamber Waste Release" + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "cxV" = ( /obj/machinery/light/directional/east, /obj/structure/chair/office{ @@ -12046,6 +12068,12 @@ c_tag = "Service - Hydroponics" }, /obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/plantgenes, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "cAd" = ( @@ -12104,7 +12132,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "cBo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -13638,7 +13666,7 @@ /obj/machinery/door/airlock/external/glass{ name = "The Noise's Jam-Tastic Radical Listening Post" }, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "dbu" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -14864,6 +14892,8 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "dyB" = ( @@ -15639,7 +15669,7 @@ /obj/structure/chair{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "dLI" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -17939,7 +17969,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "exx" = ( /obj/effect/turf_decal/stripes/line{ @@ -18364,10 +18394,6 @@ }, /turf/open/floor/engine/air, /area/station/engineering/atmos) -"eES" = ( -/obj/structure/statue/bananium/clown, -/turf/open/indestructible/dark, -/area/ruin/powered/clownplanet) "eFd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps/opaque{ @@ -18562,7 +18588,7 @@ /area/station/service/library) "eJA" = ( /obj/machinery/light/very_dim/directional/south, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "eJQ" = ( /turf/open/floor/glass/reinforced, @@ -22191,6 +22217,8 @@ dir = 5 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "fTz" = ( @@ -22209,7 +22237,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "fTP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22337,6 +22365,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"fXi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fXB" = ( /obj/structure/chair/pew, /turf/open/floor/iron/chapel{ @@ -22616,6 +22652,10 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"gcJ" = ( +/obj/item/storage/toolbox/syndicate, +/turf/closed/mineral/random/stationside/asteroid/porus, +/area/ruin/powered/clownplanet) "gcN" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/decal/cleanable/dirt, @@ -23670,8 +23710,7 @@ "gxi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/plastic, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "gxk" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -24094,6 +24133,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "gEy" = ( @@ -24728,9 +24768,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/eva) -"gNy" = ( -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "gNz" = ( /obj/machinery/light/directional/east, /turf/open/floor/engine, @@ -25243,11 +25280,7 @@ /area/station/medical/break_room) "gWk" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/engineering/tool, -/obj/effect/spawner/random/mod, -/obj/item/storage/toolbox/emergency/old, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "gWo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25262,6 +25295,8 @@ dir = 4 }, /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/engineering/atmos) "gWx" = ( @@ -25834,6 +25869,8 @@ dir = 4 }, /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/engineering/atmos) "hik" = ( @@ -30635,7 +30672,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "iOi" = ( /turf/open/floor/wood/large, @@ -30664,7 +30701,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "iOG" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -30756,6 +30793,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "iQH" = ( @@ -30871,10 +30910,6 @@ /area/station/command/heads_quarters/hos) "iSw" = ( /obj/machinery/griddle, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = 4; - pixel_x = 32 - }, /obj/machinery/light/directional/east, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) @@ -31412,7 +31447,7 @@ /area/station/maintenance/department/crew_quarters/dorms) "jap" = ( /obj/structure/chair/office, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "jav" = ( /obj/structure/alien/weeds/node, @@ -32022,12 +32057,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"jjY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/engineering/flashlight, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "jkc" = ( /obj/machinery/status_display/ai/directional/west, /obj/structure/chair/office{ @@ -33334,8 +33363,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/mineral/bananium, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "jFu" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -33420,7 +33449,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "jGX" = ( /obj/effect/landmark/event_spawn, @@ -33635,6 +33664,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "jKZ" = ( @@ -35301,7 +35331,7 @@ /area/station/science/genetics) "knr" = ( /obj/machinery/light/directional/west, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "knC" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -36239,14 +36269,13 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "kFs" = ( -/obj/item/bedsheet/clown/double{ - dir = 4 +/obj/structure/bed{ + dir = 1 }, -/obj/structure/bed/double{ - dir = 4 +/obj/item/bedsheet/syndie{ + dir = 1 }, -/obj/item/pillow/clown, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "kFu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -38372,6 +38401,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/auxlab/firing_range) +"ljK" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "ljU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39263,6 +39298,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "lyQ" = ( @@ -39469,6 +39506,7 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "lDM" = ( @@ -41182,15 +41220,6 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) -"mfL" = ( -/obj/structure/reagent_dispensers/foamtank{ - tank_volume = 1000; - reagent_id = /datum/reagent/lube/superlube; - desc = "A wheeled lubricant tank designed for clowns on interstellar voyages. There is a Donk Co logo on the front."; - name = "Lubricant Reservoir" - }, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "mfT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -43550,6 +43579,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /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/engineering/atmos) "mVu" = ( @@ -43719,6 +43750,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "mZt" = ( @@ -43746,7 +43779,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/indestructible/honk, +/turf/open/misc/asteroid, /area/ruin/powered/clownplanet) "nag" = ( /obj/effect/decal/cleanable/dirt, @@ -43817,7 +43850,7 @@ pixel_x = 8; pixel_y = 14 }, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "naN" = ( /obj/machinery/door/firedoor, @@ -44552,6 +44585,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /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/engineering/atmos) "nmP" = ( @@ -45100,6 +45135,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "nvB" = ( @@ -45904,7 +45941,7 @@ req_access = "theatre"; name = "Shoe Storage Annex" }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "nHW" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -48995,14 +49032,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"oMX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/decoration/ornament, -/obj/item/reagent_containers/cup/beaker, -/obj/item/grown/bananapeel/bluespace, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "oMZ" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -50203,11 +50232,8 @@ "piT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/turretid{ - pixel_y = -24; - req_access = "theatre" - }, -/turf/open/floor/mineral/bananium, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "piX" = ( /turf/open/floor/engine/n2o, @@ -52525,12 +52551,8 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/machinery/plantgenes, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "pQY" = ( @@ -52769,10 +52791,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) -"pVy" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "pVD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, @@ -53871,9 +53889,6 @@ "qoD" = ( /obj/structure/table, /obj/machinery/microwave, -/obj/structure/sign/poster/contraband/tipper_cream_soda{ - pixel_y = 35 - }, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "qoE" = ( @@ -54609,6 +54624,8 @@ dir = 4 }, /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/engineering/atmos) "qzJ" = ( @@ -55242,7 +55259,7 @@ }, /obj/item/kitchen/fork, /obj/item/plate, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "qIL" = ( /obj/structure/chair/comfy/shuttle, @@ -56156,6 +56173,8 @@ "qXA" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "qXS" = ( @@ -59955,7 +59974,6 @@ pixel_x = 3 }, /obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "slx" = ( @@ -60635,16 +60653,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/central) -"swV" = ( -/obj/machinery/porta_turret/syndicate/teleport{ - desc = "A ballistic banana gun auto-turret that fires banana bullets. What the fuck?"; - name = "Banana Turret"; - req_access = "theatre"; - lethal_projectile = /obj/projectile/bullet/honker; - stun_projectile = /obj/projectile/bullet/honker - }, -/turf/open/indestructible/dark, -/area/ruin/powered/clownplanet) "swZ" = ( /obj/structure/ladder, /turf/open/floor/catwalk_floor/iron_smooth, @@ -61408,10 +61416,14 @@ "sJp" = ( /obj/structure/sign/clock/directional/south, /obj/item/paper/crumpled/bloody, -/obj/structure/frame/computer{ - dir = 1 +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 0 }, -/turf/open/floor/mineral/bananium, +/obj/structure/table/glass, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "sJx" = ( /obj/structure/chair{ @@ -63115,7 +63127,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/aft) "tkp" = ( -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "tkv" = ( /obj/structure/ladder, @@ -63693,10 +63705,8 @@ dir = 1; req_access = list("syndicate") }, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = -27 - }, -/turf/open/floor/mineral/bananium, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "tsY" = ( /obj/effect/decal/cleanable/dirt, @@ -63802,10 +63812,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"tun" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "tur" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -64554,7 +64560,7 @@ dir = 8 }, /obj/structure/window/spawner/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "tIA" = ( /obj/effect/decal/cleanable/dirt, @@ -66638,10 +66644,6 @@ }, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"urq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/atmos) "urv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, @@ -67055,6 +67057,8 @@ dir = 5 }, /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/engineering/atmos) "uxq" = ( @@ -68967,6 +68971,8 @@ dir = 9 }, /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/engineering/atmos) "vaR" = ( @@ -70778,7 +70784,6 @@ dir = 1 }, /obj/structure/cable, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "vBG" = ( @@ -71020,7 +71025,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/airalarm/directional/west, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "vDG" = ( @@ -71198,6 +71202,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) "vGI" = ( @@ -71621,13 +71628,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "vNV" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) "vOx" = ( @@ -72075,6 +72081,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/maintenance/central/greater) "vUW" = ( @@ -72548,7 +72555,7 @@ name = "Old TV"; desc = "An old TV, at some point, a clown watched too much TV on this." }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "wdU" = ( /obj/machinery/door/firedoor, @@ -72974,6 +72981,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) "wlK" = ( @@ -73098,13 +73106,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"wnM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/decoration/material, -/obj/structure/table, -/obj/effect/spawner/random/engineering/material_cheap, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "wnN" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -73466,8 +73467,7 @@ /area/station/medical/morgue) "wtK" = ( /obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "wtQ" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -75594,7 +75594,7 @@ "xgi" = ( /obj/machinery/light/small/directional/north, /obj/machinery/light_switch/directional/north, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "xgp" = ( /obj/effect/turf_decal/trimline/red/filled/line, @@ -76442,10 +76442,6 @@ "xwf" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central/greater) -"xwi" = ( -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "xwz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76866,9 +76862,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/science) -"xDf" = ( -/turf/open/indestructible/honk, -/area/ruin/powered/clownplanet) "xDn" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -77643,9 +77636,7 @@ pixel_x = 0; pixel_y = 32 }, -/obj/structure/rack, -/obj/item/clothing/shoes/sneakers, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "xSr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77763,6 +77754,8 @@ /area/station/maintenance/department/crew_quarters/dorms) "xUC" = ( /obj/effect/spawner/random/engineering/tracking_beacon, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "xUG" = ( @@ -81255,8 +81248,8 @@ nPb pkp pjA mZV -xDf -xDf +pkp +pkp pkp nPb vXM @@ -83559,7 +83552,7 @@ nPb oVB nPb gcp -gNy +tkp knr tkp tkp @@ -83820,7 +83813,7 @@ atl naI tkp tkp -tun +aaA iOC aaA dbr @@ -84333,13 +84326,13 @@ gcp qQm fTI agz -tun +aaA nHV piT gcp -eES coN -swV +coN +coN nPb nPb uww @@ -84589,7 +84582,7 @@ nPb gcp cKm agF -tun +aaA eJA gcp xAc @@ -85620,10 +85613,10 @@ gcp gcp gcp gcp -mfL -xwi -wnM -gcp +nPb +nPb +nPb +nPb nPb nPb pkp @@ -85876,11 +85869,11 @@ nPb nPb nPb nPb -gcp -gcp -oMX -jjY -gcp +nPb +nPb +nPb +nPb +nPb nPb pkp pkp @@ -86134,10 +86127,10 @@ nPb nPb nPb nPb -gcp -gcp -gcp -gcp +nPb +nPb +nPb +nPb nPb pkp nPb @@ -86390,7 +86383,7 @@ pkp nPb nPb oVB -nPb +gcJ nPb nPb nPb @@ -92470,8 +92463,8 @@ abm abm abf abf -abf -acA +ljK +bVn acN acT acA @@ -92727,7 +92720,7 @@ abf abX acf acp -acp +bPp acB acO acU @@ -106060,7 +106053,7 @@ qxf qxf jIN ldD -vUP +ctg vUP wlo hSy @@ -112294,13 +112287,13 @@ hmF iQU gqL xat -urq -urq -urq -urq -urq -urq -urq +gqL +gqL +gqL +gqL +gqL +gqL +gqL wQm wQm wQm @@ -112814,8 +112807,8 @@ wQm fja wQm wQm -urq -bZW +gqL +fXi wQm kdw aOV @@ -113072,7 +113065,7 @@ oqh wQm wQm eaq -bZW +fXi wQm oaX tsp @@ -118477,7 +118470,7 @@ vde atC gqV atP -atP +cxM auf aum aup @@ -149610,7 +149603,7 @@ cdf nPb gcp jFt -pVy +knr wtK gcp gcp @@ -149868,7 +149861,7 @@ nPb gcp qBq exv -gNy +tkp agx aBI sJp @@ -150125,8 +150118,8 @@ nPb gcp qBq exv -gNy tkp +aBI jap tsR gcp @@ -150382,7 +150375,7 @@ nPb gcp iOh aQh -gNy +tkp tIw agt bxd diff --git a/code/__DEFINES/computers.dm b/code/__DEFINES/computers.dm index ba3294ae6833..86bd44d30201 100644 --- a/code/__DEFINES/computers.dm +++ b/code/__DEFINES/computers.dm @@ -11,3 +11,5 @@ #define CATEGORY_BEPIS "Bepis Tech" #define CATEGORY_BITRUNNING_FLAIR "Misc" #define CATEGORY_BITRUNNING_TECH "Tech" +#define CATEGORY_BITRUNNING_COMBAT_GEAR "Combat gear" // monkeystation addition: bitrunning tech split up +#define CATEGORY_BITRUNNING_ABILITIES "Abilities" // monkeystation addition: bitrunning tech split up diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 582584a2ab5b..7ef7a0f10c38 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -733,6 +733,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///Trait for the gamer quirk. #define TRAIT_GAMER "gamer" +/// Trait for the Extra-Sensory Paranoia quirk +#define TRAIT_PARANOIA "paranoia" + ///Trait for dryable items #define TRAIT_DRYABLE "trait_dryable" ///Trait for dried items diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm index b1cfab2078c0..66422b5386ab 100644 --- a/code/modules/bitrunning/objects/disks.dm +++ b/code/modules/bitrunning/objects/disks.dm @@ -13,9 +13,12 @@ /// Name of the choice made var/choice_made + var/monkeystation_override = FALSE // monkeystation change, override for disks with single powers/items + /obj/item/bitrunning_disk/Initialize(mapload) . = ..() - + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return icon_state = "[base_icon_state][rand(0, 7)]" update_icon() RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) @@ -25,6 +28,9 @@ examine_text += span_infoplain("This disk must be carried on your person into a netpod to be used.") + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return + if(isnull(choice_made)) examine_text += span_notice("To make a selection, toggle the disk in hand.") return diff --git a/code/modules/bitrunning/objects/vendor.dm b/code/modules/bitrunning/objects/vendor.dm index 8db855cf62f9..a995c0c0b6a9 100644 --- a/code/modules/bitrunning/objects/vendor.dm +++ b/code/modules/bitrunning/objects/vendor.dm @@ -19,8 +19,10 @@ order_categories = list( CATEGORY_BITRUNNING_FLAIR, - CATEGORY_BITRUNNING_TECH, +// CATEGORY_BITRUNNING_TECH, Monkestation removal: split up into combat gear and abilities tabs CATEGORY_BEPIS, + CATEGORY_BITRUNNING_COMBAT_GEAR, + CATEGORY_BITRUNNING_ABILITIES, ) blackbox_key = "bitrunning" diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm index 010dd131799f..f40e4fa1447c 100644 --- a/code/modules/cargo/markets/market_items/weapons.dm +++ b/code/modules/cargo/markets/market_items/weapons.dm @@ -63,44 +63,3 @@ price_max = CARGO_CRATE_VALUE * 2 stock_max = 2 availability_prob = 50 - -//monke edits -/datum/market_item/weapon/smoothbore_disabler_prime - name = "Elite Smoothbore Disabler" - desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." - item = /obj/item/gun/energy/disabler/smoothbore/prime - - price_min = CARGO_CRATE_VALUE * 3 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/pipegun_recipe - name = "Diary of a Dead Assistant" - desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." - item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 1 - availability_prob = 40 - -/datum/market_item/weapon/musket_recipe - name = "Journal of a Space Ranger" - desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." - item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/smoothbore_recipe - name = "Old Tome" - desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." - item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime - - price_min = CARGO_CRATE_VALUE * 6 - price_max = CARGO_CRATE_VALUE * 8 - stock_max = 1 - availability_prob = 20 diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index b56576099580..005afe473eb9 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -27,16 +27,10 @@ /obj/item/ammo_casing/energy/laser/musket projectile_type = /obj/projectile/beam/laser/musket e_cost = 1000 - fire_sound = 'sound/weapons/lasercannonfire.ogg' //monke edit: sounds cooler /obj/item/ammo_casing/energy/laser/musket/prime projectile_type = /obj/projectile/beam/laser/musket/prime -/obj/item/ammo_casing/energy/laser/musket/syndicate//monke edit: syndicate laser musket - projectile_type = /obj/projectile/beam/laser/musket/syndicate - e_cost = 125 - fire_sound = 'sound/weapons/laser2.ogg' - /obj/item/ammo_casing/energy/laser/practice projectile_type = /obj/projectile/beam/practice select_name = "practice" diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm index a455358dde65..70a726d81d2b 100644 --- a/code/modules/projectiles/guns/energy/crank_guns.dm +++ b/code/modules/projectiles/guns/energy/crank_guns.dm @@ -10,8 +10,9 @@ can_bayonet = TRUE knife_x_offset = 22 knife_y_offset = 11 - //monke edit:fully charges per crank because it was really confusing and unintuitive + //monke edit: fully charges per crank because it was really confusing and unintuitive //monke edit: increased cooldown time to compensate for increased charge + /obj/item/gun/energy/laser/musket/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_wielded = 10) @@ -43,26 +44,6 @@ charge_sound_cooldown_time = 1.8 SECONDS, \ ) -/obj/item/gun/energy/laser/musket/syndicate - name = "syndicate laser musket" - desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ - Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." - icon_state = "musket_syndie" - inhand_icon_state = "musket_syndie" - worn_icon_state = "las_musket_syndie" - ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) - w_class = WEIGHT_CLASS_NORMAL -/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging - . = ..() - AddComponent( \ - /datum/component/gun_crank, \ - charging_cell = get_cell(), \ - charge_amount = 250, \ - cooldown_time = 1.5 SECONDS, \ - charge_sound = 'sound/weapons/laser_crank.ogg', \ - charge_sound_cooldown_time = 1.3 SECONDS, \ - ) - /obj/item/gun/energy/disabler/smoothbore name = "smoothbore disabler" desc = "A hand-crafted disabler, using a hard knock on an energy cell to fire the stunner laser. A lack of proper focusing means it has little accuracy." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 0e79dfb0ba0f..a161c295f1d9 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -58,24 +58,16 @@ name = "low-power laser" icon_state = "laser_musket" impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser - damage = 30 //monke edit: damage changed from 25 to 30 - stamina = 45 //monke edit: brought to disabler level as is on tg + damage = 25 + stamina = 40 light_color = COLOR_STRONG_VIOLET weak_against_armour = TRUE /obj/projectile/beam/laser/musket/prime name = "mid-power laser" - damage = 35 //monke edit: damage changed from 30 to 35 - stamina = 60 //monke edit: damage changed from 45 to 60 - weak_against_armour = FALSE - -/obj/projectile/beam/laser/musket/syndicate //monke edit: syndicate laser musket - name = "resonant laser" damage = 30 - stamina = 65 + stamina = 45 weak_against_armour = FALSE - armour_penetration = 25 //less powerful than armor piercing rounds - wound_bonus = 10 /obj/projectile/beam/weak damage = 15 @@ -132,7 +124,7 @@ /obj/projectile/beam/disabler/smoothbore/prime name = "focused disabler beam" weak_against_armour = FALSE - stamina = 65 //monkie edit: changed from 35 to 65(Black market/ERT item only, even rarer is the book to make it) + stamina = 35 /obj/projectile/beam/pulse name = "pulse" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 8f1d6d37f293..d7a23cd193dd 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -126,40 +126,6 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE -/datum/design/mag_autorifle - name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" - desc = "A 20 round magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) - build_path = /obj/item/ammo_box/magazine/wt550m9 - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - -/datum/design/mag_autorifle/ap_mag - name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" - desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle_ap" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600) - build_path = /obj/item/ammo_box/magazine/wt550m9/wtap - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - -/datum/design/mag_autorifle/ic_mag - name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" - desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle_ic" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) - build_path = /obj/item/ammo_box/magazine/wt550m9/wtic - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - /datum/design/pin_testing name = "Test-Range Firing Pin" desc = "This safety firing pin allows firearms to be operated within proximity to a firing range." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5de5ffa07f7c..d01099668af0 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1485,7 +1485,6 @@ "seclite", "zipties", "inspector", - "mag_autorifle", "rubber_c35", //monkestation edit: taco sec ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) @@ -1526,7 +1525,8 @@ design_ids = list( "pin_testing", "tele_shield", - "lethal_c35", //monkestation edit: taco sec + "lethal_c35", //monkestation edit: paco sec + "mag_autorifle_rub", //monkestation edit: autorifles ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) discount_experiments = list(/datum/experiment/ordnance/explosive/pressurebomb = 5000) @@ -1538,6 +1538,8 @@ prereq_ids = list("adv_engi", "weaponry") design_ids = list( "pin_loyalty", + "mag_autorifle", //monkestation edit: autorifles + "mag_autorifle_salt", //monkestation edit: autorifles ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier3_mechbay = 2500) @@ -1605,8 +1607,6 @@ "c38_hotshot", "c38_iceblox", "techshotshell", - "mag_autorifle_ap", - "mag_autorifle_ic", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index b9f9bdd08f63..0c14c302b5ef 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -98,14 +98,3 @@ cost = 13 surplus = 50 purchasable_from = ~UPLINK_CLOWN_OPS - -/datum/uplink_item/dangerous/laser_musket - name = "Syndicate Laser Musket" - desc = "An exprimental 'rifle' designed by Aethrofusion. This laser(probably) uses alien technology to fit 4 high energy capacitors \ - into a small rifle which can be stored safely(?) in any backpack. To charge, simply press down on the main control panel. \ - Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aethrofusion assures safety for up to 2 years of use." - item = /obj/item/gun/energy/laser/musket/syndicate - progression_minimum = 30 MINUTES - cost = 12 - surplus = 40 - purchasable_from = ~UPLINK_CLOWN_OPS diff --git a/html/changelogs/AutoChangeLog-pr-257.yml b/html/changelogs/AutoChangeLog-pr-257.yml new file mode 100644 index 000000000000..88e1d0feca7b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-257.yml @@ -0,0 +1,4 @@ +author: "KittyNoodle" +delete-after: True +changes: + - bugfix: "Syndicate laser muskets can now be worn on armor again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-285.yml b/html/changelogs/AutoChangeLog-pr-285.yml new file mode 100644 index 000000000000..db96fc9bbfaa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-285.yml @@ -0,0 +1,7 @@ +author: "KittyNoodle" +delete-after: True +changes: + - rscadd: "Non-lethal and less than lethal options for autorifles have been made available." + - balance: "Autorifles have been moved to imports and made more expensive." + - balance: "Higher technologies are now needed to access autorifle ammo." + - refactor: "Autorifle code has been modularized" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-313.yml b/html/changelogs/AutoChangeLog-pr-313.yml new file mode 100644 index 000000000000..08514d48dab0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-313.yml @@ -0,0 +1,5 @@ +author: "SeeBeeSee" +delete-after: True +changes: + - rscadd: "Added new quirk that applies a permanent Extra-Sensory Paranoia - no lobotomies for this one." + - rscadd: "Added a new version of ESP that summons 10 stalkers by default, and can be called by an admin for more." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-413.yml b/html/changelogs/AutoChangeLog-pr-413.yml new file mode 100644 index 000000000000..a97f76360698 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-413.yml @@ -0,0 +1,5 @@ +author: "Gboster-0" +delete-after: True +changes: + - rscadd: "Added a lot more SMES" + - bugfix: "Singularity to PTL connection on kilo was always broken, now its not so much broken" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-463.yml b/html/changelogs/AutoChangeLog-pr-463.yml new file mode 100644 index 000000000000..06cfb1b1a441 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-463.yml @@ -0,0 +1,4 @@ +author: "OtieBoy" +delete-after: True +changes: + - bugfix: "fixed the Tramstation incinerator room atmospherics so that air supply and scrubbing pipenets are connected properly from roundstart" \ No newline at end of file diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 85e44d3dba46..f162be852c76 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -143,3 +143,21 @@ - bugfix: all bars now have the proper holosign emitters KoboldCommando: - rscadd: The botany infuser and splicer are merged into one machine +2023-10-23: + DexeeXI: + - rscadd: Readded missing water tank for Botany on Metastation + - rscadd: Readded a missing helper for the disposals system on Metastation + - rscadd: plantgenes machine in the seed vaults! + - rscdel: ALL SM gas filters for gas synthesis are removed, but the space is still + there if folk want to setup such filters for their operations. + - qol: moved the plantgenes machine and all the botany lexicons on Tram to a different + table so its not stacked. + - rscdel: reverted the "clown asteroid" on Tramstation down to 99% stock. It should + still play clown.wmv when over there, because you still are a clown if you wanna + use the place. + - rscadd: dinnerware, nanomed vendors added to Centcom + - rscadd: readded the missing tcomm server so syndie comms work again. it was on + centcom, its now back on centcom. + - qol: fixed some of the busted disposals. + - qol: zones for rooms in Oshan Medical are redone. Medbay Central is now a "common + sense" location so cargo crates can be opened properly. diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 7d753efe421b..4284c4b92f99 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 4fdf61b03eb9..fe336a4d5964 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi index bdd5290eb0ae..2cdbc55ea122 100644 Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ diff --git a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm index 308131103c7e..ea81c388e03d 100644 --- a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm +++ b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm @@ -38,7 +38,7 @@ /turf/open/floor/iron, /area/station/engineering/supermatter/room) "fx" = ( -/obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "fN" = ( @@ -195,6 +195,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"nB" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "ob" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -208,7 +215,7 @@ "oe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/window/plasma, -/obj/structure/cable, +/obj/structure/cable/multilayer/connected, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "or" = ( @@ -598,6 +605,7 @@ "NS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/directions/ptl/directional/east, +/obj/machinery/light/blacklight/directional/east, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "OT" = ( @@ -1212,8 +1220,8 @@ LD oK xG xG +nB kI -re NS oe RN @@ -1235,9 +1243,9 @@ rW Qn nb dq +nb mS zs -zs fx Ar zs diff --git a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm index f18c49ac4ab4..8b2727b91ebf 100644 --- a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm @@ -460,8 +460,9 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "re" = ( -/obj/structure/sign/warning/no_smoking{ - pixel_x = 30 +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -488,10 +489,8 @@ /turf/open/floor/circuit/red, /area/station/engineering/supermatter/room) "sz" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "sF" = ( @@ -508,7 +507,6 @@ /area/station/engineering/supermatter/room) "sY" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "th" = ( @@ -538,6 +536,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/warning/no_smoking{ + pixel_x = 30 + }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "uc" = ( @@ -606,6 +607,11 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"vz" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/circuit/red, +/area/station/engineering/supermatter/room) "vD" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -1446,10 +1452,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Wo" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, @@ -1493,10 +1495,6 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "Yu" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2012,7 +2010,7 @@ LO rW Qn dq -Ar +vz Ee fx Ar diff --git a/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm b/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm index a69772f2a04a..de068cb2ac8a 100644 --- a/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm @@ -172,6 +172,10 @@ "je" = ( /turf/template_noop, /area/space) +"jw" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "kf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -227,10 +231,6 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nM" = ( @@ -693,10 +693,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "HO" = ( @@ -1194,8 +1192,8 @@ eg ZC yT Qn -ck -ck +jw +jw UI Yf MT diff --git a/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm b/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm index 386c03667bad..666694e1d186 100644 --- a/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm @@ -13,8 +13,6 @@ /area/station/engineering/supermatter) "bw" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bG" = ( @@ -31,14 +29,12 @@ /area/station/engineering/supermatter/room) "cL" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/arrow_ccw, /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "dt" = ( @@ -309,12 +305,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) -"ln" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "lr" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -446,10 +436,6 @@ /area/station/engineering/supermatter) "oe" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -825,10 +811,6 @@ /area/station/engineering/supermatter/room) "Fs" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "FF" = ( @@ -1591,7 +1573,7 @@ ft XW Rq ix -ln +TD oe Qg TU diff --git a/monkestation/code/datums/brain_damage/magic.dm b/monkestation/code/datums/brain_damage/magic.dm new file mode 100644 index 000000000000..01a451e8c53e --- /dev/null +++ b/monkestation/code/datums/brain_damage/magic.dm @@ -0,0 +1,65 @@ +/datum/brain_trauma/magic/stalker_multiple + name = "Stalking Phantoms" + desc = "Patient is stalked by multiple phantoms only they can see." + scan_desc = "extra-EXTRA-sensory paranoia" + gain_text = span_warning("You feel like the gods have released the hounds...") + lose_text = span_notice("You no longer feel the wrath of the gods watching you.") + + var/list/stalkers = list() + + var/close_stalker = FALSE //For heartbeat + +/datum/brain_trauma/magic/stalker_multiple/Destroy() + for (var/stalker in stalkers) + QDEL_NULL(stalker) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/on_gain() + create_stalker_multiple(10) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker() + var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner + var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner) + stalkers += stalker + +/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker_multiple(count) + var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner + + for (var/x = 0; x < count; x++) + var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner) + stalkers += stalker + +/datum/brain_trauma/magic/stalker_multiple/on_lose() + for (var/stalker in stalkers) + QDEL_NULL(stalker) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/on_life(seconds_per_tick, times_fired) + // Dead and unconscious people are not interesting to the psychic stalker. + if(owner.stat != CONSCIOUS) + return + + // Not even nullspace will keep it at bay. + for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers) + if(!stalker || !stalker.loc || stalker.z != owner.z) + qdel(stalker) + create_stalker() + + for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers) + if(get_dist(owner, stalker) <= 1) + playsound(owner, 'sound/magic/demon_attack1.ogg', 10) + owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!")) + owner.take_bodypart_damage(rand(20, 45), wound_bonus=CANT_WOUND) + else if(SPT_PROB(30, seconds_per_tick)) + stalker.forceMove(get_step_towards(stalker, owner)) + if(get_dist(owner, stalker) <= 8) + if(!close_stalker) + var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) + owner.playsound_local(owner, slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) + close_stalker = TRUE + else + if(close_stalker) + owner.stop_sound_channel(CHANNEL_HEARTBEAT) + close_stalker = FALSE + ..() diff --git a/monkestation/code/datums/quirks/negative_quirks.dm b/monkestation/code/datums/quirks/negative_quirks.dm index e52ce25a73b2..84a9716adda7 100644 --- a/monkestation/code/datums/quirks/negative_quirks.dm +++ b/monkestation/code/datums/quirks/negative_quirks.dm @@ -202,3 +202,19 @@ /datum/quirk/item_quirk/allergic/post_add() if(isipc(quirk_holder)) //monkestation addition to_chat(quirk_holder, span_boldnotice("Your chassis feels frail.")) + +/datum/quirk/extra_sensory_paranoia + name = "Extra-Sensory Paranoia" + desc = "You feel like something wants to kill you..." + mob_trait = TRAIT_PARANOIA + value = -8 + icon = "fa-optin-monster" // "fa-ghost" + +/datum/quirk/extra_sensory_paranoia/add() + var/datum/brain_trauma/magic/stalker/T = new() + var/mob/living/carbon/human/H = quirk_holder + H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/extra_sensory_paranoia/remove() + var/mob/living/carbon/human/H = quirk_holder + H.cure_trauma_type(/datum/brain_trauma/magic/stalker, TRAUMA_RESILIENCE_ABSOLUTE) diff --git a/monkestation/code/game/objects/items/guns/crank_guns.dm b/monkestation/code/game/objects/items/guns/crank_guns.dm new file mode 100644 index 000000000000..5c96a49462cd --- /dev/null +++ b/monkestation/code/game/objects/items/guns/crank_guns.dm @@ -0,0 +1,49 @@ +/obj/item/gun/energy/laser/musket/syndicate + name = "syndicate laser musket" + desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ + Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." + icon = 'monkestation/icons/obj/guns/guns.dmi' + icon_state = "musket_syndie" + inhand_icon_state = "musket_syndie" + lefthand_file = 'monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/weapons/guns_righthand.dmi' + worn_icon_state = "las_musket_syndie" + ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) + w_class = WEIGHT_CLASS_NORMAL +/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging + . = ..() + AddComponent( \ + /datum/component/gun_crank, \ + charging_cell = get_cell(), \ + charge_amount = 250, \ + cooldown_time = 1.5 SECONDS, \ + charge_sound = 'sound/weapons/laser_crank.ogg', \ + charge_sound_cooldown_time = 1.3 SECONDS, \ + ) + +/obj/projectile/beam/laser/musket + damage = 30 + stamina = 45 + +/obj/projectile/beam/laser/musket/prime + damage = 35 + stamina = 60 + +/obj/projectile/beam/disabler/smoothbore/prime + stamina = 65 + +/obj/item/ammo_casing/energy/laser/musket + fire_sound = 'sound/weapons/lasercannonfire.ogg' + +/obj/item/ammo_casing/energy/laser/musket/syndicate + projectile_type = /obj/projectile/beam/laser/musket/syndicate + e_cost = 125 + fire_sound = 'sound/weapons/laser2.ogg' + +/obj/projectile/beam/laser/musket/syndicate + name = "resonant laser" + damage = 30 + stamina = 65 + weak_against_armour = FALSE + armour_penetration = 25 //less powerful than armor piercing rounds + wound_bonus = 10 diff --git a/monkestation/code/game/objects/items/guns/wt_ammo.dm b/monkestation/code/game/objects/items/guns/wt_ammo.dm new file mode 100644 index 000000000000..6da2a152b2f0 --- /dev/null +++ b/monkestation/code/game/objects/items/guns/wt_ammo.dm @@ -0,0 +1,48 @@ +/obj/item/ammo_box/magazine/wt550m9/wtrub + name = "wt550 magazine (Rubber 4.6x30mm)" + icon = 'monkestation/icons/obj/guns/ammo.dmi' + icon_state = "46x30mmtR-20" + base_icon_state = "46x30mmtR" + ammo_type = /obj/item/ammo_casing/c46x30mm/rub + +/obj/item/ammo_box/magazine/wt550m9/wtic/update_icon_state() + . = ..() + icon_state = "[base_icon_state]-[round(ammo_count(), 4)]" + +/obj/item/ammo_casing/c46x30mm/rub + name = "4.6x30mm rubber bullet casing" + desc = "A 4.6x30mm rubber bullet casing." + projectile_type = /obj/projectile/bullet/c46x30mm/rub + +/obj/projectile/bullet/c46x30mm/rub + name = "4.6x30mm rubber bullet" + damage = 4 + stamina = 35 + embedding = null + sharpness = NONE + +/obj/item/ammo_box/magazine/wt550m9/wtsalt + name = "wt550 magazine (Saltshot 4.6x30mm)" + icon = 'monkestation/icons/obj/guns/ammo.dmi' + icon_state = "46x30mmtS-20" + base_icon_state = "46x30mmtS" + ammo_type = /obj/item/ammo_casing/c46x30mm/salt + +/obj/item/ammo_box/magazine/wt550m9/wtic/update_icon_state() + . = ..() + icon_state = "[base_icon_state]-[round(ammo_count(), 4)]" + +/obj/item/ammo_casing/c46x30mm/salt + name = "4.6x30mm saltshot bullet casing" + desc = "A 4.6x30mm saltshot bullet casing." + projectile_type = /obj/projectile/bullet/c46x30mm/salt + +/obj/projectile/bullet/c46x30mm/salt + name = "4.6x30mm saltshot bullet" + damage = 0 + stamina = 30 + embedding = null + sharpness = NONE + +/obj/item/gun/ballistic/automatic/wt550/no_mag + spawnwithmagazine = FALSE diff --git a/monkestation/code/modules/antagonists/uplink_items/weapons.dm b/monkestation/code/modules/antagonists/uplink_items/weapons.dm index 9a597b7d4b75..c55ee090e9e0 100644 --- a/monkestation/code/modules/antagonists/uplink_items/weapons.dm +++ b/monkestation/code/modules/antagonists/uplink_items/weapons.dm @@ -4,3 +4,14 @@ made out of hardlight that the user can use to wreak havoc." item = /obj/item/storage/box/syndie_kit/imp_hard_spear cost = 10 + +/datum/uplink_item/dangerous/laser_musket + name = "Syndicate Laser Musket" + desc = "An exprimental 'rifle' designed by Aetherofusion. This laser(probably) uses alien technology to fit 4 high energy capacitors \ + into a small rifle which can be stored safely(?) in any backpack. To charge, simply press down on the main control panel. \ + Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aetherofusion assures safety for up to 2 years of use." + item = /obj/item/gun/energy/laser/musket/syndicate + progression_minimum = 30 MINUTES + cost = 12 + surplus = 40 + purchasable_from = ~UPLINK_CLOWN_OPS diff --git a/monkestation/code/modules/bitrunners/code/ability_disks.dm b/monkestation/code/modules/bitrunners/code/ability_disks.dm new file mode 100644 index 000000000000..08cd31f52fb6 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/ability_disks.dm @@ -0,0 +1,98 @@ +/datum/orderable_item/bitrunning_abilities + category_index = CATEGORY_BITRUNNING_ABILITIES + +/obj/item/bitrunning_disk/ability/monkestation_override + name = "bitrunning program: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/ability_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/ability/monkestation_override/Initialize(mapload) + granted_action = selectable_actions + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 abilities + */ + +/datum/orderable_item/bitrunning_abilities/conjure_cheese + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + +/obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + name = "bitrunning program: conjure cheese" + icon_state = "cheese" + selectable_actions = /datum/action/cooldown/spell/conjure/cheese + + + +/datum/orderable_item/bitrunning_abilities/basic_heal + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + +/obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + name = "bitrunning program: basic heal" + icon_state = "heal" + selectable_actions = /datum/action/cooldown/spell/basic_heal + +/** + * Tier 2 abilities + */ + +/datum/orderable_item/bitrunning_abilities/fireball + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/fireball + +/obj/item/bitrunning_disk/ability/monkestation_override/fireball + name = "bitrunning program: fireball" + icon_state = "fireball" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/fireball + + + +/datum/orderable_item/bitrunning_abilities/lightningbolt + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + +/obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + name = "bitrunning program: lightning bolt" + icon_state = "lightning" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/lightningbolt + + + +/datum/orderable_item/bitrunning_abilities/forcewall + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/forcewall + +/obj/item/bitrunning_disk/ability/monkestation_override/forcewall + name = "bitrunning program: forcewall" + icon_state = "forcewall" + selectable_actions = /datum/action/cooldown/spell/forcewall + + + +/** + * Tier 3 abilities + */ + +/datum/orderable_item/bitrunning_abilities/dragon + cost_per_order = 2500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/dragon + +/obj/item/bitrunning_disk/ability/monkestation_override/dragon + name = "bitrunning program: shapeshift, dragon" + icon_state = "dragon" + selectable_actions = /datum/action/cooldown/spell/shapeshift/dragon + + + +/datum/orderable_item/bitrunning_abilities/polar_bear + cost_per_order = 2500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + +/obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + name = "bitrunning program: shapeshift, polar bear" + icon_state = "bear" + selectable_actions = /datum/action/cooldown/spell/shapeshift/polar_bear diff --git a/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm new file mode 100644 index 000000000000..58e78d8bf326 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm @@ -0,0 +1,119 @@ +/datum/orderable_item/bitrunning_combat_gear + category_index = CATEGORY_BITRUNNING_COMBAT_GEAR + + +/obj/item/bitrunning_disk/item/monkestation_override + name = "bitrunning gear: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/item_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/item/monkestation_override/Initialize(mapload) + granted_item = selectable_items + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/pizza + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pizza + +/obj/item/bitrunning_disk/item/monkestation_override/pizza + name = "bitrunning gear: infinite pizzabox" + icon_state = "pizza" + selectable_items = /obj/item/pizzabox/infinite + + + +/datum/orderable_item/bitrunning_combat_gear/medbeam + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/medbeam + +/obj/item/bitrunning_disk/item/monkestation_override/medbeam + name = "bitrunning gear: Medical Beamgun" + icon_state = "beamgun" + selectable_items = /obj/item/gun/medbeam + + + +/datum/orderable_item/bitrunning_combat_gear/c4 + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/c4 + +/obj/item/bitrunning_disk/item/monkestation_override/c4 + name = "bitrunning gear: C4 explosive charge" + icon_state = "c4" + selectable_items = /obj/item/grenade/c4 + +/** + * Tier 2 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/chainsaw + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/chainsaw + +/obj/item/bitrunning_disk/item/monkestation_override/chainsaw + name = "bitrunning gear: chainsaw" + icon_state = "chainsaw" + selectable_items = /obj/item/chainsaw + + + +/datum/orderable_item/bitrunning_combat_gear/pistol + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pistol + +/obj/item/bitrunning_disk/item/monkestation_override/pistol + name = "bitrunning gear: makarov pistol" + icon_state = "pistol" + selectable_items = /obj/item/gun/ballistic/automatic/pistol + + + +/datum/orderable_item/bitrunning_combat_gear/hardlight_blade + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + +/obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + name = "bitrunning gear: hardlight blade" + icon_state = "hardlight_blade" + selectable_items = /obj/item/melee/energy/blade/hardlight + +/** + * Tier 3 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/tesla_cannon + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + +/obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + name = "bitrunning gear: tesla cannon" + icon_state = "tesla" + selectable_items = /obj/item/gun/energy/tesla_cannon + + + +/datum/orderable_item/bitrunning_combat_gear/dualsaber + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/dualsaber + +/obj/item/bitrunning_disk/item/monkestation_override/dualsaber + name = "bitrunning gear: double-bladed energy sword" + icon_state = "energy_blade" + selectable_items = /obj/item/dualsaber/green + + + +/datum/orderable_item/bitrunning_combat_gear/beesword + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/beesword + +/obj/item/bitrunning_disk/item/monkestation_override/beesword + name = "bitrunning gear: the stinger blade" + icon_state = "bee" + selectable_items = /obj/item/melee/beesword diff --git a/monkestation/code/modules/bitrunners/icons/ability_disks.dmi b/monkestation/code/modules/bitrunners/icons/ability_disks.dmi new file mode 100644 index 000000000000..b02e9b77bd4b Binary files /dev/null and b/monkestation/code/modules/bitrunners/icons/ability_disks.dmi differ diff --git a/monkestation/code/modules/bitrunners/icons/item_disks.dmi b/monkestation/code/modules/bitrunners/icons/item_disks.dmi new file mode 100644 index 000000000000..a5f1b7fa284b Binary files /dev/null and b/monkestation/code/modules/bitrunners/icons/item_disks.dmi differ diff --git a/monkestation/code/modules/bitrunners/readme.md b/monkestation/code/modules/bitrunners/readme.md new file mode 100644 index 000000000000..f56bf5faa0f7 --- /dev/null +++ b/monkestation/code/modules/bitrunners/readme.md @@ -0,0 +1,33 @@ + +https://github.com/Monkestation/Monkestation2.0/pull/429 + +## \ + +- Module ID: ID: BIT_RUNNERS + +### Description: + +- This modular file is for all things related to bitrunners, the PR that it started with is the title + +### TG Proc/File Changes: + + +- code/modules/bitrunning/objects/bit_vendor.dm + +### Modular Overrides: + +- N/A + +### Defines: + + +- computers.dm +- #define CATEGORY_BITRUNNING_COMBAT_GEAR +- #define CATEGORY_BITRUNNING_ABILITIES +### Included files that are not contained in this module: + +- N/A + +### Credits: + +- Gboster-0 - Splitting the tech disks into their individual parts, Most of the disk icons diff --git a/monkestation/code/modules/cargo/crates/imports.dm b/monkestation/code/modules/cargo/crates/imports.dm index e18d5dc47355..3ff490e2b347 100644 --- a/monkestation/code/modules/cargo/crates/imports.dm +++ b/monkestation/code/modules/cargo/crates/imports.dm @@ -14,3 +14,43 @@ cost = CARGO_CRATE_VALUE * 4 contains = list(/obj/item/ammo_box/n762 = 6) crate_name = "Emergency Crate" + +/datum/supply_pack/imports/wt550 + name = "WT-550 Autorifle Crate" + desc = "A proper ballistic option for a proper ballistic officer." + cost = CARGO_CRATE_VALUE * 30 + contains = list( + /obj/item/gun/ballistic/automatic/wt550/no_mag = 2, + /obj/item/ammo_box/magazine/wt550m9/wtrub = 4, + ) + crate_name = "Autorifle Crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/imports/wt550ammo/nonlethal + name = "WT-550 Non-Lethal Ammo Crate" + desc = "A supply of non-lethal ammunition for the WT-550 autorifle." + cost = CARGO_CRATE_VALUE * 5 + contains = list( + /obj/item/ammo_box/magazine/wt550m9/wtrub = 3, + /obj/item/ammo_box/magazine/wt550m9/wtsalt = 3, + ) + crate_name = "wt-550 non-lethal ammo crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/imports/wt550ammo + name = "WT-550 Ammo Crate" + desc = "A supply of spare and exotic lethal ammunition for the WT-550 autorifle." + cost = CARGO_CRATE_VALUE * 6 + contains = list( + /obj/item/ammo_box/magazine/wt550m9 = 2, + /obj/item/ammo_box/magazine/wt550m9/wtap = 2, + /obj/item/ammo_box/magazine/wt550m9/wtic = 2, + ) + crate_name = "wt-550 ammo crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon diff --git a/monkestation/code/modules/cargo/crates/security.dm b/monkestation/code/modules/cargo/crates/security.dm index 57e2a2fbeb8c..e6e5fc99bb39 100644 --- a/monkestation/code/modules/cargo/crates/security.dm +++ b/monkestation/code/modules/cargo/crates/security.dm @@ -8,27 +8,6 @@ crate_name = "secway crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/security/armory/wt550 - name = "WT-550 Autorifle Crate" - desc = "A proper ballistic option for a proper ballistic officer." - cost = CARGO_CRATE_VALUE * 7 - contains = list( - /obj/item/gun/ballistic/automatic/wt550 = 2, - /obj/item/ammo_box/magazine/wt550m9 = 2, - ) - crate_name = "Autorifle Crate" - -/datum/supply_pack/security/armory/wt550ammo - name = "WT-550 Ammo Crate" - desc = "A supply of spare and exotic ammunition for the WT-550 autorifle." - cost = CARGO_CRATE_VALUE * 4 - contains = list( - /obj/item/ammo_box/magazine/wt550m9 = 2, - /obj/item/ammo_box/magazine/wt550m9/wtap = 2, - /obj/item/ammo_box/magazine/wt550m9/wtic = 2, - ) - crate_name = "wt-550 ammo crate" - /datum/supply_pack/security/armory/combatknives name = "Combat Knives Crate" desc = "Three combat knives guaranteed to fit snugly inide any Nanotrasen standard boot. Warranty void if you stab your own ankle." diff --git a/monkestation/code/modules/cargo/markets/market_items.dm b/monkestation/code/modules/cargo/markets/market_items.dm new file mode 100644 index 000000000000..d744ef932ae1 --- /dev/null +++ b/monkestation/code/modules/cargo/markets/market_items.dm @@ -0,0 +1,39 @@ +/datum/market_item/weapon/smoothbore_disabler_prime + name = "Elite Smoothbore Disabler" + desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." + item = /obj/item/gun/energy/disabler/smoothbore/prime + + price_min = CARGO_CRATE_VALUE * 3 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/pipegun_recipe + name = "Diary of a Dead Assistant" + desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." + item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 1 + availability_prob = 40 + +/datum/market_item/weapon/musket_recipe + name = "Journal of a Space Ranger" + desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." + item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/smoothbore_recipe + name = "Old Tome" + desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." + item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime + + price_min = CARGO_CRATE_VALUE * 6 + price_max = CARGO_CRATE_VALUE * 8 + stock_max = 1 + availability_prob = 20 diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 0622a8c615fa..21d42622b5a4 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -19,19 +19,18 @@ requires_purchase = FALSE ckeywhitelist = list("bidlink2") +/datum/loadout_item/effects/cirno + ckeywhitelist = list("bidlink2") + name = "Cirno Transformation" + item_path = /obj/item/effect_granter/donator/cirno + requires_purchase = FALSE + //ttnt /datum/loadout_item/head/pot name = "Dented Pot" item_path = /obj/item/clothing/head/costume/pot -/datum/loadout_item/pocket_items/donator/spycrab - name = "Pet Delivery Beacon - Spycrab" - item_path = /obj/item/choice_beacon/pet/donator/spycrab - donator_only = TRUE - requires_purchase = FALSE - ckeywhitelist = list("unknown") - //spinnermaster /datum/loadout_item/pocket_items/donator/void_mothroach @@ -41,12 +40,25 @@ requires_purchase = FALSE ckeywhitelist = list("spinnermaster") +/datum/loadout_item/effects/void_mothroach + ckeywhitelist = list("spinnermaster") + name = "Void Mothroach Transformation" + item_path = /obj/item/effect_granter/donator/void_mothroach + requires_purchase = FALSE + + /datum/loadout_item/suit/shark_costume name = "Blahaj Costume" item_path = /obj/item/clothing/suit/hooded/shark_costume donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/toys/hotdog_plush + name = "Hotdog Plush" + item_path = /obj/item/toy/plush/hotdog + donator_only = TRUE + requires_purchase = FALSE + //ruby_flamewing /datum/loadout_item/pocket_items/donator/blahaj @@ -56,12 +68,18 @@ requires_purchase = FALSE ckeywhitelist = list("ruby_flamewing") -/datum/loadout_item/under/syndie_pajamas +/datum/loadout_item/under/miscellaneous/syndie_pajamas name = "Syndicate Pajamas" item_path = /obj/item/clothing/under/costume/syndie_pajamas donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/effects/blahaj + ckeywhitelist = list("ruby_flamewing") + name = "Blahaj Transformation" + item_path = /obj/item/effect_granter/donator/blahaj + requires_purchase = FALSE + //happiestplane /datum/loadout_item/mask/zoro name = "Zoro Mask" @@ -70,7 +88,7 @@ requires_purchase = FALSE -/datum/loadout_item/under/navy_uniform +/datum/loadout_item/under/miscellaneous/navy_uniform name = "Naval Officer Uniform" item_path = /obj/item/clothing/under/costume/navy_uniform_gold donator_only = TRUE @@ -83,18 +101,32 @@ donator_only = TRUE requires_purchase = FALSE -/datum/loadout_item/head/cirno +/datum/loadout_item/head/dark_hos name = "Dark HoS Hat" item_path = /obj/item/clothing/head/costume/dark_hos donator_only = TRUE requires_purchase = FALSE /datum/loadout_item/toys/seam_plush - name = "Puck Plush" + name = "Seam Plush" item_path = /obj/item/toy/plush/seam donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/pocket_items/donator/germanshepherd + name = "Pet Delivery Beacon - German Shepherd" + item_path = /obj/item/choice_beacon/pet/donator/germanshepherd + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("mjolnir2") + + +/datum/loadout_item/effects/germanshepherd + ckeywhitelist = list("mjolnir2") + name = "German Shepherd Transformation" + item_path = /obj/item/effect_granter/donator/germanshepherd + requires_purchase = FALSE + //sammi /datum/loadout_item/toys/puck_plush name = "Puck Plush" @@ -118,3 +150,54 @@ item_path = /obj/item/toy/plush/spider donator_only = TRUE requires_purchase = FALSE + +/datum/loadout_item/pocket_items/donator/spider + name = "Pet Delivery Beacon - Dancing Spider" + item_path = /obj/item/choice_beacon/pet/donator/spider + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("Random516") + +/datum/loadout_item/neck/whitebeard + name = "Whitebeard's cloak" + item_path = /obj/item/clothing/neck/whitebeard + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/under/miscellaneous/whitebeard + name = "Whitebeard's attire" + item_path = /obj/item/clothing/under/costume/whitebeard + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/effects/spider + ckeywhitelist = list("Random516") + name = "Spider Transformation" + item_path = /obj/item/effect_granter/donator/spider + requires_purchase = FALSE + +//senri +/datum/loadout_item/pocket_items/donator/slime + name = "Pet Delivery Beacon - Slime" + item_path = /obj/item/choice_beacon/pet/donator/slime + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("Senri08") + +/datum/loadout_item/suit/beegirl + name = "Bee's Outfit" + item_path = /obj/item/clothing/suit/costume/beegirl + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/toys/puppycat + name = "Puppycat Plush" + item_path = /obj/item/toy/plush/puppycat + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/effects/slime + ckeywhitelist = list("Senri08") + name = "Slime Transformation" + item_path = /obj/item/effect_granter/donator/slime + requires_purchase = FALSE diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm index 2cb436d538f2..5f988e040f32 100644 --- a/monkestation/code/modules/donator/code/item/choice_beacon.dm +++ b/monkestation/code/modules/donator/code/item/choice_beacon.dm @@ -32,14 +32,7 @@ /obj/item/choice_beacon/pet/donator/void_mothroach name = "Secret Beacon of the Stars" default_name = "Moffles" - company_source = "*UNINTELLIGBLE BUZZING*" - company_message = "*LOUD MOFF NOISES*" - donator_pet = /mob/living/basic/mothroach/void - -/obj/item/choice_beacon/pet/donator/void_mothroach - name = "Secret Beacon of the Stars" - default_name = "Moffles" - company_source = "*UNINTELLIGBLE BUZZING*" + company_source = "*UNINTELLIGIBLE BUZZING*" company_message = "*LOUD MOFF NOISES*" donator_pet = /mob/living/basic/mothroach/void @@ -48,11 +41,27 @@ default_name = "Blahaj" company_source = "IKEA" company_message = "Please enjoy your new pet -- some assembly required." - donator_pet = /mob/living/basic/lizard/blahaj + donator_pet = /mob/living/basic/pet/blahaj /obj/item/choice_beacon/pet/donator/cirno name = "Cirno" default_name = "Cirno?" company_source = "Touhou" company_message = "Please handle with care!" - donator_pet = /mob/living/basic/lizard/cirno + donator_pet = /mob/living/basic/pet/cirno + +/obj/item/choice_beacon/pet/donator/slime + name = "Slime" + default_name = "Slime" + company_source = "*blorbling*" + donator_pet = /mob/living/basic/pet/slime/talkative + +/obj/item/choice_beacon/pet/donator/spider + name = "Spider" + default_name = "Spider" + donator_pet = /mob/living/basic/pet/spider/dancing + +/obj/item/choice_beacon/pet/donator/germanshepherd + name = "German Shepherd" + default_name = "German Shepherd" + donator_pet = /mob/living/basic/pet/dog/germanshepherd diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm index 78afaab3b3c5..940efbf239c4 100644 --- a/monkestation/code/modules/donator/code/item/clothing.dm +++ b/monkestation/code/modules/donator/code/item/clothing.dm @@ -84,6 +84,7 @@ icon_state = "dark_hos" inhand_icon_state = null body_parts_covered = CHEST|ARMS + /obj/item/clothing/head/costume/dark_hos name = "\improper Dark Head of Security Cap" desc = "Slip this on and you're gonna be cutting people with that edge." @@ -100,3 +101,29 @@ icon_state = "lemon_bandolier" body_parts_covered = CHEST inhand_icon_state = null + +/obj/item/clothing/under/costume/whitebeard + name = "\improper Whitebeard's Attire" + desc = "The garb of a world renowned pirate." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "wbunder" + worn_icon_state = "wbunder" + inhand_icon_state = null + body_parts_covered = LEGS + +/obj/item/clothing/neck/whitebeard + name = "Whitebeard's Jacket" + desc = "The jacket of a world renowned pirate." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "wbcloak" + worn_icon_state = "wbcloak" + +/obj/item/clothing/suit/costume/beegirl + name = "Bee's Costume" + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "beegirl" + body_parts_covered = CHEST|ARMS + inhand_icon_state = null diff --git a/monkestation/code/modules/donator/code/item/effects.dm b/monkestation/code/modules/donator/code/item/effects.dm new file mode 100644 index 000000000000..d6962573f0a9 --- /dev/null +++ b/monkestation/code/modules/donator/code/item/effects.dm @@ -0,0 +1,53 @@ +/obj/item/effect_granter/donator + name = "Donator Transformation" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "void_mothroach" + var/mob/living/basic/animal_transformation = null + +/obj/item/effect_granter/donator/grant_effect(mob/living/carbon/granter) + var/mob/living/basic/animal = src.animal_transformation + animal = new animal(granter.loc) + animal.mind_initialize() + var/datum/mind/granters_mind = granter.mind + granters_mind.transfer_to(animal) + animal.adjust_hand_count(2) + qdel(granter) + . = ..() + +//Senri08 +/obj/item/effect_granter/donator/slime + name = "Slime transformation" + icon_state = "slime" + animal_transformation = /mob/living/basic/pet/slime/talkative + +//Random +/obj/item/effect_granter/donator/spider + name = "Spider transformation" + icon_state = "spider" + animal_transformation = /mob/living/basic/pet/spider/dancing + +//mjolnir +/obj/item/effect_granter/donator/germanshepherd + name = "German Shepherd transformation" + icon_state = "germanshepherd" + animal_transformation = /mob/living/basic/pet/dog/germanshepherd + +//bidlink2 +/obj/item/effect_granter/donator/cirno + name = "Cirno transformation" + icon = 'monkestation/icons/obj/plushes.dmi' + icon_state = "cirno-happy" + animal_transformation = /mob/living/basic/pet/cirno + +//Random +/obj/item/effect_granter/donator/void_mothroach + name = "Mothroach transformation" + icon_state = "void_mothroach" + animal_transformation = /mob/living/basic/mothroach/void + + +//Random +/obj/item/effect_granter/donator/blahaj + name = "Blahaj transformation" + icon_state = "blahaj" + animal_transformation = /mob/living/basic/pet/blahaj diff --git a/monkestation/code/modules/donator/code/item/plush.dm b/monkestation/code/modules/donator/code/item/plush.dm index 566c2062c1bc..20ac7dd4b2c7 100644 --- a/monkestation/code/modules/donator/code/item/plush.dm +++ b/monkestation/code/modules/donator/code/item/plush.dm @@ -37,3 +37,15 @@ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' squeak_override = list('goon/sounds/babynoise.ogg'=1) icon_state = "spider" + +/obj/item/toy/plush/puppycat + name = "puppycat plush" + desc = "A plush of Puppycat. ~Handcrafted lovingly for Senri." + icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' + icon_state = "puppycat" + +/obj/item/toy/plush/hotdog + name = "hotdog plush" + desc = "A plush of a hotdog. ~Handcrafted lovingly for Spinnermaster." + icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' + icon_state = "hotdog" diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm index 1e673bbfc3a7..590f35e01d68 100644 --- a/monkestation/code/modules/donator/code/mob/pets.dm +++ b/monkestation/code/modules/donator/code/mob/pets.dm @@ -27,7 +27,7 @@ icon_dead = "[random_icon]_dead" gold_core_spawnable = NO_SPAWN -/mob/living/basic/lizard/blahaj +/mob/living/basic/pet/blahaj name = "\improper Blåhaj" desc = "The blue shark can swim very far, dive really deep and hear noises from almost 250 meters away." icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' @@ -36,21 +36,69 @@ icon_dead = "blahaj_dead" icon_gib = null gold_core_spawnable = NO_SPAWN + ai_controller = /datum/ai_controller/basic_controller/ -/mob/living/basic/lizard/cirno //nobody needs to know she's a lizard +/mob/living/basic/pet/cirno //nobody needs to know she's a lizard name = "Cirno" desc = "She is the greatest." icon = 'monkestation/icons/obj/plushes.dmi' icon_state = "cirno-happy" icon_living = "cirno-happy" - icon_dead = "" + icon_dead = "cirno-happy" icon_gib = null gold_core_spawnable = NO_SPAWN - + ai_controller = /datum/ai_controller/basic_controller/ /mob/living/basic/lizard/snake name = "Three Headed Snake" desc = "This little fella looks familiar..." icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' icon_state = "triple_snake" - icon_dead = "" gold_core_spawnable = NO_SPAWN + +/mob/living/basic/pet/dog/germanshepherd + name = "German Shepherd" + desc = "He's so cool, he's got sunglasses!!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "germanshepherd" + icon_gib = null + can_be_held = FALSE // as funny as this would be, a german shepherd is way too big to carry with one hand + gold_core_spawnable = NO_SPAWN + +/mob/living/basic/pet/slime/talkative + name = "Extroverted Slime" + desc = "He's got a lot to say!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "slime" + gold_core_spawnable = NO_SPAWN + initial_language_holder = /datum/language_holder/slime + ai_controller = /datum/ai_controller/basic_controller/ + var/quips = list("Your fingers taste like Donk Pockets, get out more.", + "I've seen salad that dresses better than you.", + "I smell smoke, are you thinking too hard again?", + "This one's gene pool needs more chlorine...", + "I expected nothing and yet I'm still disappointed.", + "Why is this walking participation trophy touching me?", + "If I throw a stick, will you leave?",) + var/positive_quips = list("Hey there, slime pal!", + "Aw thanks buddy!",) + +/mob/living/basic/pet/slime/talkative/attack_hand(mob/living/carbon/human/user, list/modifiers) + . = ..() + if(src.stat != CONSCIOUS || (user.istate & ISTATE_HARM) || LAZYACCESS(modifiers, RIGHT_CLICK)) + return + + new /obj/effect/temp_visual/heart(src.loc) + if(prob(33)) + if(isslimeperson(user) || isoozeling(user)) + src.say(pick(positive_quips)) + else + src.say(pick(quips)) + + +/mob/living/basic/pet/spider/dancing + name = "Dancin' Spider" + desc = "Look at him go!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "spider" + gold_core_spawnable = NO_SPAWN + ai_controller = /datum/ai_controller/basic_controller/ diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi index 690bc5cc1595..2729ef4824d6 100644 Binary files a/monkestation/code/modules/donator/icons/mob/clothing.dmi and b/monkestation/code/modules/donator/icons/mob/clothing.dmi differ diff --git a/monkestation/code/modules/donator/icons/mob/pets.dmi b/monkestation/code/modules/donator/icons/mob/pets.dmi index 68659aa72bb5..e564da2b2688 100644 Binary files a/monkestation/code/modules/donator/icons/mob/pets.dmi and b/monkestation/code/modules/donator/icons/mob/pets.dmi differ diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi index ec835c12a509..da8630be9bca 100644 Binary files a/monkestation/code/modules/donator/icons/obj/clothing.dmi and b/monkestation/code/modules/donator/icons/obj/clothing.dmi differ diff --git a/monkestation/code/modules/donator/icons/obj/plushes.dmi b/monkestation/code/modules/donator/icons/obj/plushes.dmi index 19920cb71405..423b5af4c6c2 100644 Binary files a/monkestation/code/modules/donator/icons/obj/plushes.dmi and b/monkestation/code/modules/donator/icons/obj/plushes.dmi differ diff --git a/monkestation/code/modules/loadouts/items/effects.dm b/monkestation/code/modules/loadouts/items/effects.dm index 10136fff2f2c..70f5293dab85 100644 --- a/monkestation/code/modules/loadouts/items/effects.dm +++ b/monkestation/code/modules/loadouts/items/effects.dm @@ -6,6 +6,7 @@ GLOBAL_LIST_INIT(loadout_effects, generate_loadout_items(/datum/loadout_item/eff /datum/loadout_item/effects/post_equip_item(datum/preferences/preference_source, mob/living/carbon/human/equipper, visuals_only) var/obj/item/effect_granter/new_item = new item_path(equipper.loc) addtimer(CALLBACK(new_item, TYPE_PROC_REF(/obj/item/effect_granter, grant_effect), equipper), 3 SECONDS) + /datum/loadout_item/effects/honk_platinum ckeywhitelist = list("madducks") name = "Honk Platinum Transformation" diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm index ba6cfcff9ff4..8fd7d2370bb0 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm @@ -20,6 +20,7 @@ hair_color = "mutcolor" hair_alpha = 150 mutantlungs = /obj/item/organ/internal/lungs/oozeling + mutanttongue = /obj/item/organ/internal/tongue/oozeling meat = /obj/item/food/meat/slab/human/mutant/slime exotic_blood = /datum/reagent/toxin/slimeooze var/datum/action/innate/regenerate_limbs/regenerate_limbs diff --git a/monkestation/code/modules/research/designs/security_designs.dm b/monkestation/code/modules/research/designs/security_designs.dm index 644d1025e345..ee94804102bd 100644 --- a/monkestation/code/modules/research/designs/security_designs.dm +++ b/monkestation/code/modules/research/designs/security_designs.dm @@ -19,3 +19,59 @@ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO, ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle + name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" + desc = "A 20 round magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = 12000) + build_path = /obj/item/ammo_box/magazine/wt550m9 + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/ap_mag + name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" + desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_ap" + materials = list(/datum/material/iron = 15000, /datum/material/silver = 600) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtap + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/ic_mag + name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" + desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_ic" + materials = list(/datum/material/iron = 15000, /datum/material/silver = 600, /datum/material/glass = 1000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtic + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/rub_mag + name = "WT-550 Autorifle Rubber Magazine (4.6x30mm R) (Lethal)" + desc = "A 20 round rubber magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_rub" + materials = list(/datum/material/iron = 6000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtrub + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/salt_mag + name = "WT-550 Autorifle Saltshot Magazine (4.6x30mm SALT) (Non-Lethal)" + desc = "A 20 round saltshot magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_salt" + materials = list(/datum/material/iron = 6000, /datum/material/plasma = 600) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtsalt + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/monkestation/code/modules/research/techweb/all_nodes.dm b/monkestation/code/modules/research/techweb/all_nodes.dm index fb910f3f7a6e..f8d664d8eb1c 100644 --- a/monkestation/code/modules/research/techweb/all_nodes.dm +++ b/monkestation/code/modules/research/techweb/all_nodes.dm @@ -187,3 +187,14 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000, TECHWEB_POINT_TYPE_NANITES = 2500) hidden = TRUE experimental = TRUE + +/datum/techweb_node/adv_ballistics + id = "adv_ballistics" + display_name = "Advanced Ballistics" + description = "The most sophisticated methods of shooting people." + prereq_ids = list("adv_weaponry") + design_ids = list( + "mag_autorifle_ap", + "mag_autorifle_ic", + ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/monkestation/code/modules/security/icons/paco_ammo.dmi b/monkestation/code/modules/security/icons/paco_ammo.dmi index 9ab5f9e7d866..1802db63be1e 100644 Binary files a/monkestation/code/modules/security/icons/paco_ammo.dmi and b/monkestation/code/modules/security/icons/paco_ammo.dmi differ diff --git a/monkestation/code/modules/surgery/organs/internal/tongue.dm b/monkestation/code/modules/surgery/organs/internal/tongue.dm index def8bffeb7cc..684fd10d6ddb 100644 --- a/monkestation/code/modules/surgery/organs/internal/tongue.dm +++ b/monkestation/code/modules/surgery/organs/internal/tongue.dm @@ -30,3 +30,15 @@ /obj/item/organ/internal/tongue/arachnid/get_possible_languages() return ..() + /datum/language/buzzwords + +/obj/item/organ/internal/tongue/oozeling + name = "oozeling tongue" + desc = "A goopy organ that mimics the tongues of other carbon beings." + icon = 'monkestation/icons/obj/medical/organs/organs.dmi' + icon_state = "tongue_oozeling" + say_mod = "blurbles" + alpha = 200 + +// Oozeling tongues can speak all default + slime +/obj/item/organ/internal/tongue/oozeling/get_possible_languages() + return ..() + /datum/language/slime diff --git a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi index 5ab121f331c8..0311809edf11 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi index 3f85082af1dc..5bf25ffe8aad 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/monkestation/icons/obj/guns/ammo.dmi b/monkestation/icons/obj/guns/ammo.dmi new file mode 100644 index 000000000000..f01bef56f409 Binary files /dev/null and b/monkestation/icons/obj/guns/ammo.dmi differ diff --git a/monkestation/icons/obj/guns/guns.dmi b/monkestation/icons/obj/guns/guns.dmi index f44ca1a7bf83..80436df8fdd2 100644 Binary files a/monkestation/icons/obj/guns/guns.dmi and b/monkestation/icons/obj/guns/guns.dmi differ diff --git a/monkestation/icons/obj/medical/organs/organs.dmi b/monkestation/icons/obj/medical/organs/organs.dmi index 16c2f61b1d37..05102aa69188 100644 Binary files a/monkestation/icons/obj/medical/organs/organs.dmi and b/monkestation/icons/obj/medical/organs/organs.dmi differ diff --git a/strings/pill_names.json b/strings/pill_names.json index 4e5922f7221c..427d912083c6 100644 --- a/strings/pill_names.json +++ b/strings/pill_names.json @@ -120,6 +120,7 @@ "Lightning", "Liquid", "Lover", +"Lunchtime", "Macho", "Maid", "Man", @@ -142,6 +143,7 @@ "One", "Ook", "Organic", +"Patrick", "Pete", "Pineapple", "Piss", @@ -149,6 +151,7 @@ "Poor", "Power", "Pressure", +"Pretty", "prob(80)", "Psycho", "Quaalude", @@ -180,6 +183,7 @@ "South", "Space", "Spaceman", +"Special", "Speed", "Spess", "Spessman", diff --git a/tgstation.dme b/tgstation.dme index f8da165f9820..d7ace9fa35c6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5482,6 +5482,7 @@ #include "monkestation\code\datums\ai\monkey\dukeman_controller.dm" #include "monkestation\code\datums\ai_laws\laws_monke.dm" #include "monkestation\code\datums\announcers\duke.dm" +#include "monkestation\code\datums\brain_damage\magic.dm" #include "monkestation\code\datums\components\carbon_sprint.dm" #include "monkestation\code\datums\components\multi_hit.dm" #include "monkestation\code\datums\components\throw_bounce.dm" @@ -5537,8 +5538,10 @@ #include "monkestation\code\game\objects\items\effects\washing_machine.dm" #include "monkestation\code\game\objects\items\food\spaghetti.dm" #include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm" +#include "monkestation\code\game\objects\items\guns\crank_guns.dm" #include "monkestation\code\game\objects\items\guns\shotguns.dm" #include "monkestation\code\game\objects\items\guns\SRN.dm" +#include "monkestation\code\game\objects\items\guns\wt_ammo.dm" #include "monkestation\code\game\objects\items\implants\hardlight.dm" #include "monkestation\code\game\objects\items\objects\items\robot\robot_upgrades.dm" #include "monkestation\code\game\objects\items\storage\book.dm" @@ -5682,6 +5685,8 @@ #include "monkestation\code\modules\antimatter\code\shielding.dm" #include "monkestation\code\modules\ballpit\ballbit_sink.dm" #include "monkestation\code\modules\ballpit\ballpit.dm" +#include "monkestation\code\modules\bitrunners\code\ability_disks.dm" +#include "monkestation\code\modules\bitrunners\code\combat_gear_disks.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker_assets.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_conversion.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_datum.dm" @@ -5765,6 +5770,7 @@ #include "monkestation\code\modules\cargo\crates\science.dm" #include "monkestation\code\modules\cargo\crates\security.dm" #include "monkestation\code\modules\cargo\crates\service.dm" +#include "monkestation\code\modules\cargo\markets\market_items.dm" #include "monkestation\code\modules\cargoborg\code\cargo_module.dm" #include "monkestation\code\modules\cargoborg\code\cargo_teleporter.dm" #include "monkestation\code\modules\cargoborg\code\cargoborg_items.dm" @@ -5860,6 +5866,7 @@ #include "monkestation\code\modules\donator\code\datum\loadout.dm" #include "monkestation\code\modules\donator\code\item\choice_beacon.dm" #include "monkestation\code\modules\donator\code\item\clothing.dm" +#include "monkestation\code\modules\donator\code\item\effects.dm" #include "monkestation\code\modules\donator\code\item\plush.dm" #include "monkestation\code\modules\donator\code\mob\pets.dm" #include "monkestation\code\modules\events\wizard\summon_gifts.dm"