From e6b03254cef89dc8ef67e83f6c8e0b588848a5d6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:32:33 +0200 Subject: [PATCH] [MIRROR] Converts foxes to basic mobs. [MDB IGNORE] (#22358) * Converts foxes to basic mobs. (#76662) ## About The Pull Request As the title says, foxes are now basic mobs. Foxes have a few new behaviors now, rather than the zero behaviors they had before. Foxes, being very skittish animals, will flee from anything that damages them. Additionally, they now have hunting behavior, tracking down and killing anything of their size or smaller - regardless of faction. They will not, however, hunt as long as someone is watching them - which is to say, if any living humans are within 7 tiles of them. Don't leave a fox and a chicken together while you're transporting your grain to Lavaland! Also, make sure you don't leave Renault and Ian on their play date unsupervised... ![image](https://github.com/tgstation/tgstation/assets/105025397/152f56f7-02ae-4b1f-8556-2571ed485683) ## Why It's Good For The Game Gets rid of another simple animal. We grow ever closer to ascension. Also, makes foxes a little more interesting rather than simply another animal that does literally nothing. Renault will now flee from anyone trying to kill her, for instance. Also opens up unique avenues of pet murder if you want to make it look like an accident. ## Changelog :cl: refactor: Foxes are more crafty now. They will run from danger, and hunt small prey when no one is keeping an eye on them. Don't leave Renault alone with Ian! /:cl: * Converts foxes to basic mobs. * Run UpdatePaths * Fixes a renalt objective modular override --------- Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com> Co-authored-by: Giz --- .../IceRuins/icemoon_underground_library.dmm | 288 +++---- .../SpaceRuins/skyrat/interdynefob.dmm | 2 +- _maps/map_files/Birdshot/birdshot.dmm | 76 +- .../map_files/Deltastation/DeltaStation2.dmm | 180 ++-- .../map_files/IceBoxStation/IceBoxStation.dmm | 114 +-- _maps/map_files/MetaStation/MetaStation.dmm | 120 +-- _maps/map_files/NorthStar/north_star.dmm | 778 +++++++++--------- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 2 +- _maps/map_files/tramstation/tramstation.dmm | 572 ++++++------- _maps/shuttles/emergency_hugcage.dmm | 2 +- .../basic_subtrees/simple_find_target.dm | 10 + .../basic_subtrees/speech_subtree.dm | 6 + code/datums/memory/_memory.dm | 2 +- .../infuser_tier_zero_entries.dm | 2 +- .../heretic/magic/eldritch_shapeshift.dm | 4 +- .../traitor/objectives/kill_pet.dm | 2 +- code/modules/cargo/packs/livestock.dm | 7 +- code/modules/holodeck/holo_effect.dm | 2 +- code/modules/mob/living/basic/pets/fox.dm | 80 ++ code/modules/mob/living/living.dm | 2 +- .../mob/living/simple_animal/friendly/fox.dm | 43 - code/modules/research/experimentor.dm | 2 +- .../unit_tests/simple_animal_freeze.dm | 2 - .../traitor/objectives/kill_pet.dm | 2 +- tgstation.dme | 2 +- .../Scripts/76662_simple_to_basic_foxes.txt | 1 + 26 files changed, 1178 insertions(+), 1125 deletions(-) create mode 100644 code/modules/mob/living/basic/pets/fox.dm delete mode 100644 code/modules/mob/living/simple_animal/friendly/fox.dm create mode 100644 tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm index f3fdf5199d1..94b177c5662 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm @@ -61,19 +61,6 @@ "an" = ( /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/buried_library) -"ao" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) -"ap" = ( -/obj/item/stack/sheet/mineral/wood, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "aq" = ( /obj/structure/fluff/paper/stack, /obj/effect/mapping_helpers/broken_floor, @@ -111,10 +98,6 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"aA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/icemoon, -/area/ruin/unpowered/buried_library) "aC" = ( /obj/item/feather, /turf/open/misc/asteroid/snow/icemoon, @@ -150,22 +133,6 @@ /obj/item/clothing/head/costume/rice_hat, /turf/open/floor/cult, /area/ruin/unpowered/buried_library) -"aJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/cult, -/area/ruin/unpowered/buried_library) -"aK" = ( -/obj/item/feather, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/cult, -/area/ruin/unpowered/buried_library) -"aL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper/stack, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "aM" = ( /obj/item/stack/sheet/mineral/wood, /obj/item/book/manual/random, @@ -177,45 +144,16 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"aO" = ( -/mob/living/simple_animal/pet/fox, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "aP" = ( /obj/item/keycard/library, /turf/closed/mineral/random/snow, /area/ruin/unpowered/buried_library) -"aQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "aR" = ( /obj/structure/fluff/paper/stack, /turf/open/floor/wood{ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"aS" = ( -/obj/structure/table/wood/fancy/black, -/obj/effect/decal/cleanable/dirt, -/obj/item/paper/secretrecipe, -/obj/item/flashlight/lantern/jade{ - on = 1 - }, -/turf/open/floor/cult, -/area/ruin/unpowered/buried_library) -"aT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "aU" = ( /obj/item/stack/sheet/mineral/wood, /turf/open/misc/asteroid/snow/icemoon, @@ -265,16 +203,6 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"bd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper{ - dir = 1 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "be" = ( /obj/structure/fluff/paper{ dir = 5 @@ -283,26 +211,10 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"bf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper{ - dir = 4 - }, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "bg" = ( /obj/item/paper/fluff/ruins/oldstation/protogun, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/buried_library) -"bh" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/pet/fox, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) "bi" = ( /obj/structure/fluff/paper, /turf/open/misc/asteroid/snow/icemoon, @@ -375,27 +287,8 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) -"bC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper{ - dir = 1 - }, -/mob/living/simple_animal/pet/fox, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) -"bE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood{ - initial_gas_mix = "ICEMOON_ATMOS" - }, -/area/ruin/unpowered/buried_library) -"bH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fluff/paper, -/obj/effect/mapping_helpers/broken_floor, +"bI" = ( +/mob/living/basic/pet/fox, /turf/open/floor/wood{ initial_gas_mix = "ICEMOON_ATMOS" }, @@ -432,6 +325,113 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin/unpowered/buried_library) +"gb" = ( +/obj/structure/table/wood/fancy/black, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper/secretrecipe, +/obj/item/flashlight/lantern/jade{ + on = 1 + }, +/turf/open/floor/cult, +/area/ruin/unpowered/buried_library) +"gv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"ms" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper{ + dir = 4 + }, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"oi" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icemoon, +/area/ruin/unpowered/buried_library) +"or" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper/stack, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"pk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"vW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper{ + dir = 1 + }, +/mob/living/basic/pet/fox, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"Aq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"DL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"Ei" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/pet/fox, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"Gs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/paper{ + dir = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"GM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) +"PF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/cult, +/area/ruin/unpowered/buried_library) +"TP" = ( +/obj/item/feather, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/cult, +/area/ruin/unpowered/buried_library) +"Xd" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/ruin/unpowered/buried_library) (1,1,1) = {" aa @@ -525,9 +525,9 @@ bb av ak ah -aL +or ah -aT +Aq ac ad aa @@ -544,13 +544,13 @@ ak an aC ae -aQ +DL ah ak av bg ah -bH +pk ah ak ac @@ -569,13 +569,13 @@ an ae an aM -aO +bI ah au ah -aA +oi ah -ao +gv ah bM ac @@ -593,16 +593,16 @@ ac ak au ak -bE +GM aR -bE -aA -ao +GM +oi +gv bw ah aZ ah -bC +vW ac ad ad @@ -617,15 +617,15 @@ ad ak ak av -aA +oi an aG aD aX an -bE +GM ae -bE +GM ah ae ac @@ -650,9 +650,9 @@ aD bB ak ae -bE +GM ae -bE +GM ac an bw @@ -665,7 +665,7 @@ aa ad ad ac -ap +Xd an ak aD @@ -674,7 +674,7 @@ aN an aw ak -ao +gv bK aR ae @@ -698,9 +698,9 @@ an aD aD by -bE +GM aw -ao +gv ae bm ac @@ -737,14 +737,14 @@ ad ad al am -aJ +PF aW ay bw ah -ao +gv ae -bE +GM ae af an @@ -761,15 +761,15 @@ ad (14,1,1) = {" ad al -aS +gb aW -aK +TP al at ah an ah -bh +Ei ah az ah @@ -777,7 +777,7 @@ ak ah ak bn -bH +pk ac ad aa @@ -792,11 +792,11 @@ ar al bc ah -aL +or ah -aA +oi ah -bE +GM ah ak ak @@ -815,11 +815,11 @@ al al al al -bd +Gs ah -bE +GM ah -ao +gv aV ak ah @@ -841,7 +841,7 @@ ad ad ac be -bf +ms bw aP bw diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index d995872cf0b..6b3215c6108 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -9393,7 +9393,7 @@ /obj/structure/window/reinforced/survival_pod{ dir = 6 }, -/mob/living/simple_animal/pet/fox{ +/mob/living/basic/pet/fox{ name = "Rhials" }, /turf/open/floor/iron/dark/smooth_large, diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 56419c1fa33..1d829b08bca 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -5773,6 +5773,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/rust, /area/station/maintenance/department/engine/atmos) +"cvx" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) "cvy" = ( /obj/structure/bed/roller, /turf/open/floor/iron/dark, @@ -9150,6 +9156,16 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) +"dKY" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "dLb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -22260,13 +22276,6 @@ "isj" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/teleporter) -"isr" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/diagonal, -/area/station/command/heads_quarters/hop) "ist" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23130,16 +23139,6 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/command/heads_quarters/hop) -"iIH" = ( -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/table, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "iIN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26884,12 +26883,6 @@ dir = 1 }, /area/station/hallway/primary/central/fore) -"jZs" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/captain/private) "jZI" = ( /obj/item/storage/backpack/duffelbag/sec{ pixel_y = 12 @@ -31813,6 +31806,12 @@ /obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, /area/station/security/tram) +"lJs" = ( +/obj/effect/turf_decal/bot_red, +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/reagent_dispensers/cooking_oil, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "lJA" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 @@ -54190,6 +54189,10 @@ "tjj" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) +"tjk" = ( +/obj/machinery/computer/order_console/cook, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "tjQ" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_red{ @@ -55112,10 +55115,6 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden/monastery) -"tzX" = ( -/obj/machinery/computer/order_console/cook, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "tAq" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -59174,6 +59173,13 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/small, /area/station/hallway/primary/central/fore) +"uQp" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/diagonal, +/area/station/command/heads_quarters/hop) "uQu" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/status_display/door_timer{ @@ -68758,12 +68764,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"xCR" = ( -/obj/effect/turf_decal/bot_red, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/reagent_dispensers/cooking_oil, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "xCS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -93398,7 +93398,7 @@ pLr qoD uVT wqi -isr +uQp iLC iLC jts @@ -93675,8 +93675,8 @@ jVM ygb ipt jVM -iIH -tzX +dKY +tjk tGq tGq qnA @@ -94960,7 +94960,7 @@ qtb jVM vXW jVM -xCR +lJs pww pRU tGq @@ -101627,7 +101627,7 @@ xRH gcz lHW jOU -jZs +cvx wSZ lFg xqC diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 065e033dcc9..a326d8d85c6 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -579,13 +579,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/checkpoint/customs/fore) -"agn" = ( -/obj/structure/bed/dogbed/renault, -/obj/machinery/newscaster/directional/south, -/mob/living/simple_animal/pet/fox/renault, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/captain) "ago" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -1409,20 +1402,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"aqr" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Service - Hydroponics Kitchen Access"; - name = "service camera" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/service/kitchen) "aqs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10022,12 +10001,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"ctl" = ( -/obj/structure/table/wood, -/obj/item/papercutter, -/obj/item/paper/fluff/ids_for_dummies, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "ctw" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi1"; @@ -10480,21 +10453,6 @@ }, /turf/open/floor/glass, /area/station/maintenance/space_hut/observatory) -"czr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 8 - }, -/area/station/service/kitchen) "czy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, @@ -27676,6 +27634,20 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"gSb" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Service - Hydroponics Kitchen Access"; + name = "service camera" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/service/kitchen) "gSe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27914,6 +27886,40 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/storage/primary) +"gVv" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/light_switch/directional/west{ + pixel_x = -38; + pixel_y = 8 + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = -38; + pixel_y = -7; + req_access = list("kitchen") + }, +/obj/machinery/button/ticket_machine{ + pixel_y = 22 + }, +/obj/item/radio/intercom/directional/north{ + pixel_y = 30 + }, +/obj/machinery/button/door/directional/west{ + id = "hopblast"; + name = "Lockdown Blast Doors"; + pixel_y = 6; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/west{ + id = "hopline"; + name = "Queue Shutters Control"; + pixel_y = -6; + req_access = list("hop") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "gVx" = ( /obj/structure/cable, /obj/machinery/door/window/brigdoor/right/directional/south{ @@ -35652,14 +35658,6 @@ /obj/structure/sign/poster/official/work_for_a_future/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"iVW" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "iWc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -56316,6 +56314,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"ofe" = ( +/obj/structure/bed/dogbed/renault, +/obj/machinery/newscaster/directional/south, +/mob/living/basic/pet/fox/renault, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/captain) "ofg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -57023,6 +57028,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"onD" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "onK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59402,40 +59415,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"oWL" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/light_switch/directional/west{ - pixel_x = -38; - pixel_y = 8 - }, -/obj/machinery/button/flasher{ - id = "hopflash"; - pixel_x = -38; - pixel_y = -7; - req_access = list("kitchen") - }, -/obj/machinery/button/ticket_machine{ - pixel_y = 22 - }, -/obj/item/radio/intercom/directional/north{ - pixel_y = 30 - }, -/obj/machinery/button/door/directional/west{ - id = "hopblast"; - name = "Lockdown Blast Doors"; - pixel_y = 6; - req_access = list("hop") - }, -/obj/machinery/button/door/directional/west{ - id = "hopline"; - name = "Queue Shutters Control"; - pixel_y = -6; - req_access = list("hop") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "oXe" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -61966,6 +61945,21 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark/textured_large, /area/station/medical/cryo) +"pDz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/service/kitchen) "pDE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79350,6 +79344,12 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"tRN" = ( +/obj/structure/table/wood, +/obj/item/papercutter, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "tRO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/south, @@ -128036,7 +128036,7 @@ kGt cyM fyw gld -czr +pDz rEP pyC lZa @@ -128291,7 +128291,7 @@ ueJ bIG csw frR -aqr +gSb ddg uWI oHQ @@ -132440,9 +132440,9 @@ sEm dEA ymi pRS -oWL +gVv eGs -iVW +onD dxW sCh cvE @@ -133725,7 +133725,7 @@ wmp rgW mGw pRS -ctl +tRN lAv nAz jce @@ -137320,7 +137320,7 @@ gOU gOU vDo eBw -agn +ofe gOU fOw fBm diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2fa2ba3ef9c..fd3ce6548c7 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -5906,6 +5906,16 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"bPC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Service Hallway - Upper West" + }, +/obj/structure/table, +/turf/open/floor/plating, +/area/station/hallway/secondary/service) "bPE" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east, @@ -10062,6 +10072,10 @@ /obj/structure/ladder, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"dcg" = ( +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/genturf, +/area/icemoon/underground/unexplored/rivers/deep) "dck" = ( /obj/structure/cable, /turf/open/floor/carpet/red, @@ -14568,13 +14582,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"eAn" = ( -/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/hallway/secondary/service) "eAs" = ( /obj/structure/cable, /obj/machinery/light/directional/south, @@ -18559,12 +18566,6 @@ dir = 1 }, /area/station/security/prison) -"fQM" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/station/command/bridge) "fRx" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, @@ -23129,17 +23130,6 @@ dir = 4 }, /area/station/service/chapel) -"hrO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/duct, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/plating, -/area/station/hallway/secondary/service) "hrZ" = ( /obj/structure/chair/office/light{ dir = 4 @@ -26190,10 +26180,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/detective, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"irs" = ( -/obj/item/paper/fluff/ids_for_dummies, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers/deep) "iry" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -34642,6 +34628,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/large, /area/station/engineering/engine_smes) +"kYM" = ( +/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/hallway/secondary/service) "kYQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -35446,11 +35439,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"lmo" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "lms" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -43866,6 +43854,13 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"nVn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "nVr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51399,13 +51394,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) -"qry" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/flip, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "qrJ" = ( /obj/machinery/ticket_machine/directional/east, /obj/effect/turf_decal/tile/blue, @@ -54576,6 +54564,11 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rsv" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "rsC" = ( /obj/machinery/light/directional/west, /obj/machinery/camera/directional/west{ @@ -55485,6 +55478,12 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) +"rFq" = ( +/obj/structure/table/reinforced, +/obj/item/storage/secure/briefcase, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/command/bridge) "rFr" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -63077,6 +63076,17 @@ /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, /area/station/engineering/supermatter) +"ueC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/duct, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/plating, +/area/station/hallway/secondary/service) "ueD" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -73221,16 +73231,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) -"xnl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Service Hallway - Upper West" - }, -/obj/structure/table, -/turf/open/floor/plating, -/area/station/hallway/secondary/service) "xnr" = ( /obj/structure/sign/poster/official/here_for_your_safety/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79221,7 +79221,7 @@ oSU oSU oSU oSU -irs +dcg oSU oSU oSU @@ -234858,7 +234858,7 @@ dnq kgD utR uEQ -fQM +rFq grA cEv nOH @@ -239493,7 +239493,7 @@ tEd lpM eEC aTw -lmo +rsv hpe wwB mBX @@ -242557,7 +242557,7 @@ njx vfW sfA dIe -qry +nVn dIn xFA aTV @@ -242814,12 +242814,12 @@ lvk lvk xpo gmW -hrO +ueC rtc rtc jJf voM -eAn +kYM jFA mnj uVn @@ -243076,7 +243076,7 @@ tux dsO kQX tGZ -xnl +bPC mdZ mdZ bVA diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e14132f4150..28f43df6d29 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -7174,16 +7174,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"cMV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/computer/order_console/cook{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "cMX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -21240,18 +21230,6 @@ /obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"hSX" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Head of Personnel's Office" - }, -/obj/structure/table/wood, -/obj/machinery/light/directional/south, -/obj/item/papercutter{ - pixel_x = -4 - }, -/obj/item/paper/fluff/ids_for_dummies, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "hTn" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -24020,12 +23998,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/main) -"iMZ" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "iNc" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster/directional/south, @@ -35809,6 +35781,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"mWD" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Head of Personnel's Office" + }, +/obj/structure/table/wood, +/obj/machinery/light/directional/south, +/obj/item/papercutter{ + pixel_x = -4 + }, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "mWE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36515,12 +36499,6 @@ /obj/structure/chair/office, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"njF" = ( -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "njP" = ( /obj/machinery/door/window{ name = "Captain's Desk"; @@ -40372,6 +40350,16 @@ /obj/item/radio/intercom/chapel/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"oCg" = ( +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 1; + pixel_y = -29 + }, +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "oCw" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral, @@ -40735,6 +40723,12 @@ "oIa" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) +"oIb" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "oId" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, @@ -41215,16 +41209,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"oRT" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 - }, -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "oSc" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -45963,6 +45947,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"qGb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/computer/order_console/cook{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "qGc" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -48775,6 +48769,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"rHj" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/vending/cigarette, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) "rHk" = ( /obj/structure/table/glass, /obj/item/folder/blue{ @@ -49724,16 +49728,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"rWI" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/vending/cigarette, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) "rWL" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -52998,6 +52992,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"tdS" = ( +/obj/machinery/light/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "tdW" = ( /turf/closed/wall/r_wall, /area/station/security/execution/education) @@ -91569,7 +91569,7 @@ pJR pJR iiE rGj -hSX +mWD pJR oUB qRI @@ -92083,7 +92083,7 @@ pJR sGc mIl fJp -iMZ +oIb mig wMx qRI @@ -97996,7 +97996,7 @@ jxv sqJ gPA lZM -oRT +oCg syo lSz vQe @@ -105973,8 +105973,8 @@ glP deX rJk ofe -cMV -njF +qGb +tdS aBM unL lPy @@ -106487,7 +106487,7 @@ ggM gIS xNG gYV -rWI +rHj qpn tHk unL diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 9a71b3161f1..1fd8a6ef72b 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -425,15 +425,6 @@ /obj/effect/spawner/random/trash/botanical_waste, /turf/open/floor/pod/light, /area/station/maintenance/floor4/port) -"aeS" = ( -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced/rglass, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "aeW" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -1389,30 +1380,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/medical/virology/isolation) -"arm" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/vest{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/suit/armor/vest{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/sec{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/sec, -/obj/item/clothing/head/helmet/sec{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/sign/poster/official/random/directional/east, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "arq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/east, @@ -7063,12 +7030,6 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, /area/station/command/meeting_room) -"bGY" = ( -/obj/structure/table, -/obj/item/paper_bin/construction, -/obj/item/pen/fountain, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/hop) "bHh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line{ @@ -11072,6 +11033,15 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"cJf" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "cJh" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11876,6 +11846,15 @@ /obj/machinery/disposal/bin, /turf/open/floor/wood, /area/station/hallway/secondary/entry) +"cUK" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/table/reinforced/rglass, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "cUL" = ( /turf/closed/wall, /area/station/cargo/storage) @@ -12520,6 +12499,12 @@ /obj/machinery/light/small/red/directional/south, /turf/open/floor/pod/light, /area/station/maintenance/floor3/port/aft) +"ddt" = ( +/obj/structure/table, +/obj/item/paper_bin/construction, +/obj/item/pen/fountain, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/hop) "ddv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/bronze, @@ -13117,6 +13102,22 @@ dir = 1 }, /area/station/cargo/office) +"dnI" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/item/gun/energy/disabler{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/energy/disabler, +/obj/item/gun/energy/disabler{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "dnJ" = ( /obj/structure/railing{ dir = 4 @@ -13890,6 +13891,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"dyO" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/engine/hull/reinforced, +/area/space/nearstation) "dyP" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -15924,6 +15931,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) +"dYw" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/floor2/port/aft) "dYx" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -17602,6 +17613,12 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"euU" = ( +/obj/structure/table, +/obj/machinery/status_display/evac/directional/north, +/obj/item/papercutter, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "euW" = ( /obj/machinery/door/airlock/hatch{ name = "Maintenance Bulkhead" @@ -19905,12 +19922,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/janitor) -"fga" = ( -/obj/structure/table, -/obj/machinery/status_display/evac/directional/north, -/obj/item/papercutter, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "fgr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes{ @@ -21110,15 +21121,6 @@ dir = 1 }, /area/station/service/chapel) -"fxc" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "fxd" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -22580,6 +22582,16 @@ dir = 4 }, /area/station/ai_monitored/command/storage/eva) +"fQG" = ( +/obj/structure/table/wood, +/obj/item/paper/fluff/ids_for_dummies, +/obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/north, +/obj/item/storage/crayons{ + pixel_x = 16 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "fQH" = ( /obj/structure/cable, /obj/machinery/door/window/brigdoor/left/directional/south{ @@ -23032,6 +23044,13 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard/aft) +"fWA" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "fWD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24425,10 +24444,6 @@ }, /turf/open/floor/pod/light, /area/station/maintenance/floor3/port/aft) -"gpt" = ( -/obj/structure/lattice/catwalk, -/turf/open/floor/plating/airless, -/area/space/nearstation) "gpu" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -27418,6 +27433,32 @@ /obj/machinery/light/directional/south, /turf/open/openspace, /area/station/service/library) +"hdK" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "hdL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27914,15 +27955,6 @@ dir = 1 }, /area/station/hallway/floor1/aft) -"hkj" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/west, -/obj/structure/cable, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/captain/private) "hkk" = ( /obj/structure/railing{ dir = 4 @@ -30739,16 +30771,6 @@ /obj/structure/cable, /turf/open/floor/pod/light, /area/station/maintenance/floor1/starboard/fore) -"hYB" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/digital_clock/directional/north, -/obj/item/storage/box/bodybags, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "hYN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31803,10 +31825,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/locker) -"inK" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "inM" = ( /obj/structure/sign/poster/official/random/directional/west, /obj/machinery/camera/autoname/directional/west, @@ -31972,6 +31990,14 @@ }, /turf/open/floor/iron/dark, /area/station/security/eva) +"iqp" = ( +/obj/structure/closet/mini_fridge{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/structure/table, +/turf/open/floor/iron/checker, +/area/station/commons/dorms/apartment1) "iqt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32091,6 +32117,15 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/fore) +"irX" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "isd" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 4 @@ -33381,6 +33416,34 @@ }, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard/fore) +"iKy" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/secure/safe/directional/east, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "iKz" = ( /obj/structure/ladder, /obj/structure/disposalpipe/segment{ @@ -37314,6 +37377,19 @@ /obj/machinery/door/window/right/directional/north, /turf/open/misc/sandy_dirt, /area/station/hallway/secondary/entry) +"jMd" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/machinery/door/airlock/external{ + name = "External Airlock" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/floor2/port/aft) "jMn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -37792,6 +37868,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"jSu" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/folder/blue, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hop) "jSy" = ( /obj/machinery/smartfridge, /obj/machinery/door/firedoor, @@ -38833,6 +38919,14 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) +"kgX" = ( +/obj/structure/closet/mini_fridge{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/structure/table, +/turf/open/floor/iron/checker, +/area/station/commons/dorms/apartment2) "kgY" = ( /obj/effect/turf_decal/stripes, /turf/open/floor/iron, @@ -39852,6 +39946,19 @@ }, /turf/open/floor/wood/parquet, /area/station/service/lawoffice) +"kvk" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ + pixel_y = 3 + }, +/obj/item/gun/ballistic/shotgun/riot{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "kvw" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, @@ -40920,6 +41027,14 @@ "kJq" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) +"kJE" = ( +/obj/vehicle/sealed/mecha/ripley/cargo, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/textured_large, +/area/station/cargo/warehouse) "kJG" = ( /obj/structure/closet/athletic_mixed, /turf/open/floor/pod/light, @@ -41776,10 +41891,6 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/plating, /area/station/medical/abandoned) -"kVT" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/floor2/port/aft) "kVY" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -42829,13 +42940,6 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/grass, /area/station/maintenance/floor3/starboard) -"lji" = ( -/obj/machinery/door/window/brigdoor{ - dir = 1 - }, -/mob/living/simple_animal/pet/fox, -/turf/open/floor/noslip, -/area/station/maintenance/floor1/port) "ljs" = ( /obj/machinery/flasher/portable, /obj/machinery/camera/directional/east{ @@ -44901,19 +45005,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/pharmacy) -"lLO" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, -/obj/machinery/door/airlock/external{ - name = "External Airlock" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/floor2/port/aft) "lMj" = ( /obj/effect/turf_decal/trimline/white/arrow_ccw, /obj/machinery/camera/autoname/directional/south, @@ -46846,6 +46937,13 @@ /obj/machinery/holopad, /turf/open/floor/carpet/red, /area/station/service/library) +"miJ" = ( +/obj/machinery/door/window/brigdoor{ + dir = 1 + }, +/mob/living/basic/pet/fox, +/turf/open/floor/noslip, +/area/station/maintenance/floor1/port) "miV" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -49969,15 +50067,6 @@ }, /turf/open/openspace, /area/station/maintenance/floor2/port) -"mWG" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "mWH" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -53458,14 +53547,6 @@ /obj/item/storage/bag/tray/cafeteria, /turf/open/floor/iron, /area/station/security/prison) -"nOj" = ( -/obj/vehicle/sealed/mecha/ripley/cargo, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/textured_large, -/area/station/cargo/warehouse) "nOB" = ( /obj/structure/kitchenspike, /obj/structure/sign/poster/random/directional/north, @@ -54730,6 +54811,15 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"ofb" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/captain/private) "ofg" = ( /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 8 @@ -56211,6 +56301,30 @@ "ozt" = ( /turf/open/openspace, /area/station/medical/psychology) +"ozE" = ( +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "ozF" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/east, @@ -57088,6 +57202,28 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"oMn" = ( +/obj/item/grenade/barrier{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/south{ + c_tag = "Armory - Interior" + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "oMz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/directional/west, @@ -57501,6 +57637,30 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) +"oSf" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/vest{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/sec{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/sec, +/obj/item/clothing/head/helmet/sec{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "oSg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -60032,22 +60192,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/medical/abandoned) -"pCP" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/item/gun/energy/disabler{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/gun/energy/disabler, -/obj/item/gun/energy/disabler{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "pCS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4{ @@ -62717,6 +62861,14 @@ /obj/structure/foamedmetal, /turf/open/floor/plating, /area/station/maintenance/floor1/port/aft) +"qpo" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/mannequin/skeleton, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "qpp" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Waste Release" @@ -62724,14 +62876,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) -"qpr" = ( -/obj/structure/closet/mini_fridge{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/structure/table, -/turf/open/floor/iron/checker, -/area/station/commons/dorms/apartment2) "qpt" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -62943,6 +63087,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/abandoned) +"qsN" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ + pixel_y = 3 + }, +/obj/item/gun/energy/e_gun{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "qsP" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/status_display/ai/directional/east, @@ -64423,6 +64580,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/ce) +"qIs" = ( +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/airless, +/area/space/nearstation) "qIv" = ( /obj/machinery/door/window/left/directional/south{ name = "Robotics Lab"; @@ -65085,12 +65246,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side, /area/station/hallway/floor4/fore) -"qRS" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/openspace, -/area/space) "qRW" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -68678,6 +68833,21 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"rSF" = ( +/obj/structure/table, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/item/hand_labeler{ + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "rSJ" = ( /obj/structure/chair/plastic{ dir = 8 @@ -68820,14 +68990,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/textured_large, /area/station/security/checkpoint/escape) -"rUt" = ( -/obj/structure/closet/mini_fridge{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/structure/table, -/turf/open/floor/iron/checker, -/area/station/commons/dorms/apartment1) "rUD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69832,19 +69994,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"smy" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/gun/energy/e_gun, -/obj/item/gun/energy/e_gun{ - pixel_y = 3 - }, -/obj/item/gun/energy/e_gun{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "smJ" = ( /turf/open/floor/plating, /area/station/maintenance/floor3/port/fore) @@ -70987,6 +71136,19 @@ /obj/item/stamp/head/hos, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"sCa" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/floor2/port/aft) "sCe" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/table/wood, @@ -71937,19 +72099,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port/fore) -"sPn" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "sPp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76103,21 +76252,6 @@ }, /turf/open/floor/plating, /area/station/security/brig) -"tTM" = ( -/obj/structure/table, -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/requests_console/directional/north{ - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/item/hand_labeler{ - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "tTS" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor, @@ -76177,12 +76311,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"tUT" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "tVa" = ( /obj/structure/table, /obj/item/folder/red{ @@ -77992,28 +78120,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/pod/dark, /area/station/maintenance/floor4/starboard) -"uwg" = ( -/obj/item/grenade/barrier{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/item/grenade/barrier{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/structure/table/reinforced, -/obj/machinery/camera/directional/south{ - c_tag = "Armory - Interior" - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "uwl" = ( /obj/machinery/computer/slot_machine, /obj/machinery/firealarm/directional/west, @@ -79871,32 +79977,6 @@ /obj/structure/cable, /turf/open/floor/iron/chapel, /area/station/service/chapel) -"uVt" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/shield/riot, -/obj/item/shield/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "uVz" = ( /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 1 @@ -80445,30 +80525,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"vci" = ( -/obj/item/storage/box/rubbershot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/rubbershot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/box/rubbershot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/structure/sign/poster/official/random/directional/south, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "vcr" = ( /turf/closed/wall, /area/station/maintenance/floor1/port/aft) @@ -80798,6 +80854,12 @@ /obj/effect/turf_decal/trimline/blue/filled, /turf/open/floor/iron, /area/station/hallway/floor4/fore) +"vhZ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/space/openspace, +/area/space) "vio" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/landmark/start/scientist, @@ -85146,14 +85208,6 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron, /area/station/security/brig) -"wmN" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/mannequin/skeleton, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "wmQ" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -86483,6 +86537,16 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/security/brig) +"wDM" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/digital_clock/directional/north, +/obj/item/storage/box/bodybags, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "wDS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -87111,34 +87175,11 @@ }, /turf/open/floor/iron/dark/side, /area/station/hallway/floor2/fore) -"wKz" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/floor2/port/aft) "wKE" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/red, /area/station/service/theater) -"wKF" = ( -/obj/structure/table/wood, -/obj/item/folder/yellow{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/folder/blue, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/hop) "wKL" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -88562,34 +88603,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port/aft) -"xet" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/secure/safe/directional/east, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "xeu" = ( /obj/structure/railing, /turf/open/floor/iron/stairs{ @@ -89853,13 +89866,6 @@ /obj/structure/sign/directions/vault/directional/north, /turf/open/floor/iron/smooth, /area/station/hallway/floor3/fore) -"xvY" = ( -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "xwa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90937,6 +90943,10 @@ /obj/machinery/light/blacklight/directional/south, /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) +"xKk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine/hull/reinforced, +/area/space/nearstation) "xKq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -92536,16 +92546,6 @@ /obj/structure/table, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/fore) -"yiJ" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff/ids_for_dummies, -/obj/machinery/light/small/directional/north, -/obj/machinery/newscaster/directional/north, -/obj/item/storage/crayons{ - pixel_x = 16 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "yiK" = ( /obj/effect/spawner/random/structure/table_fancy, /obj/structure/window/reinforced/spawner/directional/north, @@ -115496,7 +115496,7 @@ bAh htK oic gUS -nOj +kJE dzo bUC yiZ @@ -122984,7 +122984,7 @@ dyS xgH bvi eVk -lji +miJ xgH wVn xgH @@ -196996,7 +196996,7 @@ fou eAV hrw jRO -hYB +wDM bKs gCw slI @@ -197253,7 +197253,7 @@ dQH jdx cnK jRO -aeS +cUK rlB wLV uMK @@ -197510,7 +197510,7 @@ jSW nrX mkE gQx -fxc +irX xWy pfd fQH @@ -197767,7 +197767,7 @@ hbj cle bWz jRO -wmN +qpo qAh rAu lVE @@ -207781,7 +207781,7 @@ nlN nlN nlN nlN -wKz +sCa nlN nlN nlN @@ -208038,7 +208038,7 @@ nlN nlN nlN nlN -kVT +dYw nlN nlN nlN @@ -208295,7 +208295,7 @@ oyh oyh oyh nlN -lLO +jMd nlN oyh oyh @@ -208552,7 +208552,7 @@ oyh oyh oyh oyh -gpt +qIs oyh oyh oyh @@ -208809,7 +208809,7 @@ oyh oyh oyh oyh -gpt +qIs oyh oyh oyh @@ -209066,7 +209066,7 @@ oyh oyh oyh oyh -gpt +qIs hQT oyh oyh @@ -209323,7 +209323,7 @@ oyh oyh oyh edA -gpt +qIs fPW eYj eYj @@ -209583,7 +209583,7 @@ oyh oyh oyh oyh -tUT +dyO eYj fPW oyh @@ -210094,7 +210094,7 @@ oyh oyh oyh oyh -inK +xKk oyh oyh oyh @@ -248908,7 +248908,7 @@ aUy gBr sRh tUG -xvY +fWA vuC gyr sng @@ -251977,7 +251977,7 @@ qrd qrd qrd iHm -yiJ +fQG bQe twg pPf @@ -256099,7 +256099,7 @@ cdF ftv jiL wTW -rUt +iqp xkT xpA jFi @@ -260982,7 +260982,7 @@ cdF ftv jiL wfR -qpr +kgX vOM lkP sVY @@ -275371,7 +275371,7 @@ ucA ucA ucA ucA -qRS +vhZ acl pRs acl @@ -311340,7 +311340,7 @@ glw aNs gZJ per -hkj +ofb jvM nSV pHT @@ -317509,9 +317509,9 @@ gDy gDy mYF nPE -fga +euU ipn -bGY +ddt geD hUY liQ @@ -317766,13 +317766,13 @@ gDy sNe xby nPE -tTM +rSF ipn qLH geD wHu jmR -wKF +jSu qXg hZe liQ @@ -321133,7 +321133,7 @@ sHY rDZ cbw lOp -sPn +kvk dtX oOW qjr @@ -321390,7 +321390,7 @@ sHY xIP cbw lOp -smy +qsN cUd lXm kdh @@ -321647,11 +321647,11 @@ sHY hAP qtQ owC -mWG +cJf fCS mqB lOp -vci +ozE iXF sPs ycM @@ -321904,11 +321904,11 @@ sHY cAt cbw xOY -pCP +dnI xDG qqE eLg -uwg +oMn uXo sPs orf @@ -322418,9 +322418,9 @@ oDd dPH vuf nkr -arm -xet -uVt +oSf +iKy +hdK gMo jOc iXF diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index c0b4362213e..c292e42c9ba 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -40443,7 +40443,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/science/xenobiology) "lAu" = ( -/mob/living/simple_animal/pet/fox/renault, +/mob/living/basic/pet/fox/renault, /obj/effect/turf_decal/siding/wood, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c45e2906e67..e8e2f949e36 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3105,13 +3105,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/station/cargo/warehouse) -"alz" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 9 - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "alA" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -3235,6 +3228,13 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"amP" = ( +/obj/structure/table, +/obj/structure/closet/mini_fridge, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/cup/soda_cans/cola, +/turf/open/floor/iron/white, +/area/station/service/kitchen) "amQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3703,12 +3703,6 @@ /obj/structure/sign/clock/directional/south, /turf/open/floor/iron, /area/station/commons/fitness) -"arq" = ( -/obj/structure/table/wood, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "ary" = ( /obj/structure/table/wood, /obj/item/pillow/random, @@ -4908,6 +4902,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) +"aCO" = ( +/obj/structure/table/wood, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "aCR" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -5283,6 +5283,20 @@ }, /turf/open/floor/iron, /area/station/security/prison) +"aFA" = ( +/obj/structure/table, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "aFP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -10033,6 +10047,21 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +"caF" = ( +/obj/structure/rack, +/obj/item/gun/energy/disabler{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/disabler, +/obj/item/gun/energy/disabler{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "caP" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -11206,25 +11235,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/security/checkpoint/medical) -"cyn" = ( -/obj/structure/rack, -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "cyp" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -13115,18 +13125,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/dorms) -"dfl" = ( -/obj/machinery/door/airlock{ - id_tag = "commissarydoor"; - name = "Barber Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/service/barber) "dfw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -13990,6 +13988,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/computer) +"dwZ" = ( +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/misc/asteroid/airless, +/area/station/asteroid) "dxw" = ( /obj/machinery/newscaster/directional/north, /obj/structure/cable, @@ -16070,10 +16072,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/freezer, /area/station/medical/coldroom) -"elS" = ( -/obj/item/paper/fluff/ids_for_dummies, -/turf/open/misc/asteroid/airless, -/area/station/asteroid) "elV" = ( /obj/machinery/duct, /obj/structure/cable, @@ -17751,20 +17749,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"eUd" = ( -/obj/structure/table, -/obj/item/storage/box/rubbershot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "eUo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -21047,10 +21031,6 @@ }, /turf/open/openspace, /area/station/hallway/primary/tram/center) -"gjO" = ( -/obj/machinery/digital_clock, -/turf/closed/wall, -/area/station/medical/treatment_center) "gjP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/left/directional/east{ @@ -21651,6 +21631,14 @@ "gvI" = ( /turf/closed/wall, /area/station/security/prison) +"gvN" = ( +/obj/structure/table/wood, +/obj/item/papercutter{ + pixel_x = -4 + }, +/obj/item/paper/fluff/ids_for_dummies, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "gvO" = ( /obj/machinery/duct, /obj/structure/cable, @@ -22231,14 +22219,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"gFV" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "gGb" = ( /obj/structure/sign/warning/secure_area{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -24885,6 +24865,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/safe) +"hLK" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "hMd" = ( /obj/structure/table, /obj/item/clipboard, @@ -26250,6 +26237,21 @@ }, /turf/open/floor/glass, /area/station/command/meeting_room) +"imB" = ( +/obj/structure/rack, +/obj/item/gun/ballistic/shotgun/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "ina" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -26980,6 +26982,25 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/airless, /area/station/asteroid) +"iAU" = ( +/obj/structure/rack, +/obj/item/gun/energy/laser{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "iBa" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -27462,12 +27483,6 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) -"iLD" = ( -/obj/machinery/chem_mass_spec, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "iLP" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/box, @@ -30341,13 +30356,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"jMY" = ( -/obj/machinery/door/airlock{ - id_tag = "commissarydoor"; - name = "Barber Storage" - }, -/turf/open/floor/plating, -/area/station/service/barber) "jNb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -31548,6 +31556,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"kjw" = ( +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/space/nearstation) "kjH" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/white/full, @@ -31912,14 +31924,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"kqy" = ( -/obj/vehicle/sealed/mecha/ripley/cargo, -/obj/machinery/requests_console/directional/north{ - department = "Cargo Bay"; - name = "Cargo Bay Requests Console" - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "kqD" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ dir = 4 @@ -34406,26 +34410,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/tram/mid) -"lhp" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/e_gun, -/obj/item/gun/energy/e_gun{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Armory"; - network = list("ss13","Security") - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "lhI" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -35226,6 +35210,10 @@ }, /turf/closed/wall/r_wall, /area/station/science/ordnance/storage) +"lwN" = ( +/obj/machinery/digital_clock, +/turf/closed/wall/r_wall, +/area/station/command/bridge) "lwV" = ( /obj/machinery/camera/emp_proof{ c_tag = "Engineering - Atmospherics Plasma Chamber"; @@ -36423,6 +36411,13 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"lTf" = ( +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Barber Storage" + }, +/turf/open/floor/plating, +/area/station/service/barber) "lTM" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 @@ -40343,11 +40338,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/office) -"npH" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "npX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -40832,6 +40822,14 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"nyZ" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "nzd" = ( /obj/structure/chair{ dir = 1 @@ -42870,6 +42868,34 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/service/library) +"olh" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "olw" = ( /obj/structure/industrial_lift/tram/white, /obj/structure/fluff/tram_rail, @@ -44011,6 +44037,26 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"oMM" = ( +/obj/structure/rack, +/obj/item/gun/energy/e_gun{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Armory"; + network = list("ss13","Security") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "oMU" = ( /obj/structure/railing/corner{ dir = 4 @@ -44267,6 +44313,11 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/left) +"oRF" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "oRH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/corner{ @@ -44369,10 +44420,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) -"oTk" = ( -/obj/machinery/digital_clock, -/turf/closed/wall/r_wall, -/area/station/command/bridge) "oTl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48851,18 +48898,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"qzQ" = ( -/obj/structure/table, -/obj/item/grenade/barrier{ - pixel_x = 4 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = -4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "qAb" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/decal/cleanable/dirt, @@ -49109,6 +49144,38 @@ "qEH" = ( /turf/closed/wall, /area/station/solars/port) +"qEM" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/toggleable/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/toggleable/riot, +/obj/item/clothing/head/helmet/toggleable/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "qFf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -50536,14 +50603,6 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningdock) -"rfk" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "rfQ" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -52519,59 +52578,12 @@ }, /turf/open/floor/glass/reinforced, /area/station/science/genetics) -"rQv" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/toggleable/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/toggleable/riot, -/obj/item/clothing/head/helmet/toggleable/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/shield/riot, -/obj/item/shield/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "rQG" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"rQJ" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "rQR" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -52981,6 +52993,18 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"sab" = ( +/obj/structure/table, +/obj/item/grenade/barrier{ + pixel_x = 4 + }, +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ + pixel_x = -4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "saj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, @@ -53420,6 +53444,10 @@ dir = 4 }, /area/station/service/theater) +"siK" = ( +/obj/machinery/digital_clock, +/turf/closed/wall, +/area/station/medical/treatment_center) "siL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -53968,13 +53996,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"ssf" = ( -/obj/structure/table, -/obj/structure/closet/mini_fridge, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/cup/soda_cans/cola, -/turf/open/floor/iron/white, -/area/station/service/kitchen) "ssi" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ @@ -55211,6 +55232,15 @@ "sNs" = ( /turf/closed/wall, /area/station/commons/storage/primary) +"sNu" = ( +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "sNv" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -61016,34 +61046,6 @@ "uJH" = ( /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"uJI" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "uJN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -61766,6 +61768,14 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/meeting_room) +"uWE" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "uWI" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/sign/departments/medbay/alt{ @@ -62043,21 +62053,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"vah" = ( -/obj/structure/rack, -/obj/item/gun/energy/disabler{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/disabler, -/obj/item/gun/energy/disabler{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "vaj" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/disposalpipe/segment{ @@ -66326,6 +66321,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"wAY" = ( +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Barber Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/service/barber) "wBb" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron/white, @@ -66370,10 +66377,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) -"wBR" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) "wBV" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance) @@ -66853,6 +66856,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"wLB" = ( +/obj/machinery/chem_mass_spec, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "wLP" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -67512,14 +67521,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"xaK" = ( -/obj/structure/table/wood, -/obj/item/papercutter{ - pixel_x = -4 - }, -/obj/item/paper/fluff/ids_for_dummies, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "xaR" = ( /obj/effect/mapping_helpers/airlock/access/all/service/general, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -68493,6 +68494,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) +"xwH" = ( +/obj/vehicle/sealed/mecha/ripley/cargo, +/obj/machinery/requests_console/directional/north{ + department = "Cargo Bay"; + name = "Cargo Bay Requests Console" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "xxe" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -68772,15 +68781,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"xBj" = ( -/obj/structure/table/wood, -/obj/item/storage/secure/briefcase{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "xBk" = ( /turf/closed/wall, /area/station/medical/storage) @@ -74948,7 +74948,7 @@ aaa gcp gcp gcp -elS +dwZ aac aaa aaa @@ -102338,7 +102338,7 @@ dQt iRL snQ iRL -alz +hLK twg dWn cWZ @@ -105685,13 +105685,13 @@ abM abM abM abM -dfl +wAY gpq tqd usz lML fFl -jMY +lTf eep eep mGw @@ -151443,7 +151443,7 @@ umf qjW kHX iDR -xBj +sNu wHT omH jKZ @@ -151951,8 +151951,8 @@ aBV cCR aBV wHT -xaK -arq +gvN +aCO vBn eDZ sik @@ -153712,12 +153712,12 @@ aaa aaa aaa dEv -rQv +qEM trm epT hgn mKP -eUd +aFA dEv avP rZA @@ -153969,7 +153969,7 @@ dEv dEv dEv dEv -uJI +olh exx ouM iub @@ -154228,7 +154228,7 @@ gxf gxf dst xYC -rQJ +imB eIR iub hgn @@ -154484,9 +154484,9 @@ pvi yjm yjm hPs -cyn +iAU lAC -lhp +oMM aeX yjm oby @@ -154737,12 +154737,12 @@ aaa aaa aaa dEv -qzQ +sab uPZ eSj dst xYC -vah +caF avf avg hgn @@ -155807,7 +155807,7 @@ aQO aQO aQO aQO -oTk +lwN aQO aQO aQO @@ -158631,7 +158631,7 @@ xEo xEo nFZ jXU -npH +oRF xEo aaS aaS @@ -164832,9 +164832,9 @@ hgX xRx bWU pVk -gFV +uWE xRx -rfk +nyZ bVt cpl apC @@ -165075,7 +165075,7 @@ izU aGM izU jyH -iLD +wLB eHN csg mma @@ -167871,7 +167871,7 @@ vuD guL fKn guL -ssf +amP mUL rBy vJt @@ -169456,7 +169456,7 @@ iTt itk jtr jtr -gjO +siK xSZ xqB xSZ @@ -179950,7 +179950,7 @@ nUF jTQ mrg cTU -kqy +xwH pZA uax uax @@ -183927,7 +183927,7 @@ jhd jhd jhd rxw -wBR +kjw jhd jhd jhd diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency_hugcage.dmm index 3bbb07ec162..596b9158149 100644 --- a/_maps/shuttles/emergency_hugcage.dmm +++ b/_maps/shuttles/emergency_hugcage.dmm @@ -27,7 +27,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape/brig) "cW" = ( -/mob/living/simple_animal/pet/fox, +/mob/living/basic/pet/fox, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dz" = ( diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm index 5c85d128bb9..ec4ef1863ad 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm @@ -3,3 +3,13 @@ /datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) + +// Prevents finding a target if a human is nearby +/datum/ai_planning_subtree/simple_find_target/not_while_observed + +/datum/ai_planning_subtree/simple_find_target/not_while_observed/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + for(var/mob/living/carbon/human/watcher in hearers(7, controller.pawn)) + if(watcher.stat != DEAD) + return + return ..() + diff --git a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm index 03d4cae546b..b9a63466d1f 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm @@ -169,3 +169,9 @@ emote_hear = list("buzzes.", "clacks.") emote_see = list("shakes their head.", "twitches their antennae.") speak = list("BZZZZT!", "CHTCHTCHT!", "Bzzz", "ChtChtCht") + +/datum/ai_planning_subtree/random_speech/fox + speech_chance = 1 + emote_hear = list("howls.", "barks.", "screams.") + emote_see = list("shakes their head.", "shivers.") + speak = list("Ack-Ack", "Ack-Ack-Ack-Ackawoooo", "Geckers", "Awoo", "Tchoff") diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index b465e6ef85a..cc841d55d70 100644 --- a/code/datums/memory/_memory.dm +++ b/code/datums/memory/_memory.dm @@ -262,6 +262,7 @@ /mob/living/basic/pet/dog/breaddog, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/basic/statue, /mob/living/basic/stickman, /mob/living/basic/stickman/dog, @@ -278,7 +279,6 @@ /mob/living/simple_animal/parrot, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/cak, - /mob/living/simple_animal/pet/fox, /obj/item/food/sausage/american, /obj/item/skub, ) diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm index 64f251f0c1c..b078b5c76ed 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm @@ -38,7 +38,7 @@ "i hope it was worth it", ) input_obj_or_mob = list( - /mob/living/simple_animal/pet/fox, + /mob/living/basic/pet/fox, ) output_organs = list( /obj/item/organ/internal/ears/fox, diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm index aed5cb78c92..b8a8f39fbc3 100644 --- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm +++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm @@ -12,10 +12,10 @@ spell_requirements = NONE possible_shapes = list( + /mob/living/basic/carp, /mob/living/basic/mouse, /mob/living/basic/pet/dog/corgi, - /mob/living/basic/carp, + /mob/living/basic/pet/fox, /mob/living/simple_animal/bot/secbot, - /mob/living/simple_animal/pet/fox, /mob/living/simple_animal/pet/cat, ) diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index b156ca85560..fc46350aaa3 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -22,7 +22,7 @@ /mob/living/basic/pet/dog/corgi/ian, /mob/living/basic/pet/dog/corgi/puppy/ian ), - JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault, + JOB_CAPTAIN = /mob/living/basic/pet/fox/renault, JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime, JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly, JOB_QUARTERMASTER = list( diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm index bd58abd984f..c624f05df61 100644 --- a/code/modules/cargo/packs/livestock.dm +++ b/code/modules/cargo/packs/livestock.dm @@ -133,9 +133,10 @@ desc = "The fox goes...? Contains one fox. Comes with a collar!"//what does the fox say cost = CARGO_CRATE_VALUE * 10 access_view = ACCESS_CAPTAIN - contains = list(/mob/living/simple_animal/pet/fox, - /obj/item/clothing/neck/petcollar, - ) + contains = list( + /mob/living/basic/pet/fox, + /obj/item/clothing/neck/petcollar, + ) crate_name = "fox crate" /datum/supply_pack/critter/goat diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index ba8522e93c9..4660636e94d 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -84,8 +84,8 @@ mobtype = list( /mob/living/basic/butterfly, /mob/living/basic/chick/permanent, + /mob/living/basic/pet/fox/docile, /mob/living/basic/rabbit, - /mob/living/simple_animal/pet/fox, ) mobtype += pick( /mob/living/basic/pet/dog/corgi, diff --git a/code/modules/mob/living/basic/pets/fox.dm b/code/modules/mob/living/basic/pets/fox.dm new file mode 100644 index 00000000000..578a64ba08d --- /dev/null +++ b/code/modules/mob/living/basic/pets/fox.dm @@ -0,0 +1,80 @@ +/* Foxes. +* +* Foxes are cowardly creatures that will hunt any small animals, but only when no one is looking. +*/ + +/mob/living/basic/pet/fox + name = "fox" + desc = "They're a fox." + icon = 'icons/mob/simple/pets.dmi' + icon_state = "fox" + icon_living = "fox" + icon_dead = "fox_dead" + speak_emote = list("geckers", "barks") + butcher_results = list(/obj/item/food/meat/slab = 3) + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "gently pushes aside" + response_disarm_simple = "gently push aside" + response_harm_continuous = "kicks" + response_harm_simple = "kick" + gold_core_spawnable = FRIENDLY_SPAWN + can_be_held = TRUE + held_state = "fox" + melee_damage_lower = 5 + melee_damage_upper = 5 + attack_verb_continuous = "bites" + attack_verb_simple = "bite" + attack_sound = 'sound/weapons/bite.ogg' + attack_vis_effect = ATTACK_EFFECT_BITE + ai_controller = /datum/ai_controller/basic_controller/fox + +/mob/living/basic/pet/fox/Initialize(mapload) + . = ..() + AddElement(/datum/element/pet_bonus, "pants and yaps happily!") + AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_CLAW) + AddElement(/datum/element/tiny_mob_hunter, MOB_SIZE_SMALL) + AddElement(/datum/element/ai_retaliate) + +/datum/ai_controller/basic_controller/fox + blackboard = list( + BB_BASIC_MOB_FLEEING = TRUE, + BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction, + BB_FLEE_TARGETTING_DATUM = new /datum/targetting_datum/basic/ignore_faction + ) + + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + planning_subtrees = list( + /datum/ai_planning_subtree/target_retaliate/to_flee, + /datum/ai_planning_subtree/flee_target/from_flee_key, + /datum/ai_planning_subtree/simple_find_target/not_while_observed, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + /datum/ai_planning_subtree/random_speech/fox, + ) + +// An AI controller for more docile foxes. +/datum/ai_controller/basic_controller/fox/docile + planning_subtrees = list( + /datum/ai_planning_subtree/target_retaliate/to_flee, + /datum/ai_planning_subtree/flee_target/from_flee_key, + /datum/ai_planning_subtree/random_speech/fox, + ) + +// Foxes will attack other station pets regardless of faction. +/datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction + +/datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction/faction_check(mob/living/living_mob, mob/living/the_target) + return FALSE + +// The captain's fox, Renault +/mob/living/basic/pet/fox/renault + name = "Renault" + desc = "Renault, the Captain's trustworthy fox." + gender = FEMALE + gold_core_spawnable = NO_SPAWN + unique_pet = TRUE + +// A more docile subtype that won't attack other animals. +/mob/living/basic/pet/fox/docile + ai_controller = /datum/ai_controller/basic_controller/fox/docile diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 51d0127aaf8..60ef26c18ce 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1472,6 +1472,7 @@ /mob/living/basic/pet/dog/breaddog, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/basic/statue, /mob/living/basic/stickman, /mob/living/basic/stickman/dog, @@ -1488,7 +1489,6 @@ /mob/living/simple_animal/parrot, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/cak, - /mob/living/simple_animal/pet/fox, ) new_mob = new picked_animal(loc) diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm deleted file mode 100644 index 00a51c5f83f..00000000000 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ /dev/null @@ -1,43 +0,0 @@ -//Foxxy -/mob/living/simple_animal/pet/fox - name = "fox" - desc = "They're a fox." - icon = 'icons/mob/simple/pets.dmi' - icon_state = "fox" - icon_living = "fox" - icon_dead = "fox_dead" - speak = list("Ack-Ack","Ack-Ack-Ack-Ackawoooo","Geckers","Awoo","Tchoff") - speak_emote = list("geckers", "barks") - emote_hear = list("howls.","barks.") - emote_see = list("shakes their head.", "shivers.") - speak_chance = 1 - turns_per_move = 5 - butcher_results = list(/obj/item/food/meat/slab = 3) - response_help_continuous = "pets" - response_help_simple = "pet" - response_disarm_continuous = "gently pushes aside" - response_disarm_simple = "gently push aside" - response_harm_continuous = "kicks" - response_harm_simple = "kick" - gold_core_spawnable = FRIENDLY_SPAWN - can_be_held = TRUE - held_state = "fox" - ///In the case 'melee_damage_upper' is somehow raised above 0 - attack_verb_continuous = "bites" - attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' - attack_vis_effect = ATTACK_EFFECT_BITE - - footstep_type = FOOTSTEP_MOB_CLAW - -/mob/living/simple_animal/pet/fox/Initialize(mapload) - . = ..() - AddElement(/datum/element/pet_bonus, "pants and yaps happily!") - -//Captain fox -/mob/living/simple_animal/pet/fox/renault - name = "Renault" - desc = "Renault, the Captain's trustworthy fox." - gender = FEMALE - gold_core_spawnable = NO_SPAWN - unique_pet = TRUE diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a2dd8b0ddd3..1e139e15556 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -645,12 +645,12 @@ /mob/living/basic/mouse, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/simple_animal/crab, /mob/living/simple_animal/hostile/bear, /mob/living/simple_animal/hostile/bee, /mob/living/simple_animal/parrot/natural, /mob/living/simple_animal/pet/cat, - /mob/living/simple_animal/pet/fox, ) for(var/counter in 1 to rand(1, 25)) var/mobType = pick(valid_animals) diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 47159204cd8..eaa61c08943 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -276,8 +276,6 @@ /mob/living/simple_animal/pet/cat/original, /mob/living/simple_animal/pet/cat/runtime, /mob/living/simple_animal/pet/cat/space, - /mob/living/simple_animal/pet/fox, - /mob/living/simple_animal/pet/fox/renault, /mob/living/simple_animal/pet/gondola, /mob/living/simple_animal/pet/gondola/gondolapod, /mob/living/simple_animal/pet/penguin, diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm index f1b380bf8bc..68865d44b21 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -5,7 +5,7 @@ /mob/living/basic/pet/dog/corgi/ian, /mob/living/basic/pet/dog/corgi/puppy/ian ), - JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault, + JOB_CAPTAIN = /mob/living/basic/pet/fox/renault, JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime, JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly, JOB_QUARTERMASTER = list( diff --git a/tgstation.dme b/tgstation.dme index 2fa8940a976..7cf45d70961 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4096,6 +4096,7 @@ #include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_loot.dm" #include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_vileworm.dm" #include "code\modules\mob\living\basic\pets\dog.dm" +#include "code\modules\mob\living\basic\pets\fox.dm" #include "code\modules\mob\living\basic\pets\pet.dm" #include "code\modules\mob\living\basic\ruin_defender\stickman.dm" #include "code\modules\mob\living\basic\space_fauna\ant.dm" @@ -4315,7 +4316,6 @@ #include "code\modules\mob\living\simple_animal\friendly\cat.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" -#include "code\modules\mob\living\simple_animal\friendly\fox.dm" #include "code\modules\mob\living\simple_animal\friendly\gondola.dm" #include "code\modules\mob\living\simple_animal\friendly\penguin.dm" #include "code\modules\mob\living\simple_animal\friendly\pet.dm" diff --git a/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt b/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt new file mode 100644 index 00000000000..5fd7a1aa0f4 --- /dev/null +++ b/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt @@ -0,0 +1 @@ +/mob/living/simple_animal/pet/fox/@SUBTYPES : /mob/living/basic/pet/fox/@SUBTYPES{@OLD}