cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts foxes to basic mobs. (#76662)

Browse Source 
## 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
🆑
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!
/🆑
This commit is contained in:
lizardqueenlexi
2023-07-10 17:52:52 -06:00
committed by GitHub
parent ade047f2c9
commit a490fbe8dc
23 changed files with 1484 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+3 -3
View File
@@ -145,7 +145,7 @@
},
/area/ruin/unpowered/buried_library)
"aO" = (
/mob/living/simple_animal/pet/fox,
/mob/living/basic/pet/fox,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -327,7 +327,7 @@
/area/ruin/unpowered/buried_library)
"cA" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/pet/fox,
/mob/living/basic/pet/fox,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -394,7 +394,7 @@
/obj/structure/fluff/paper{
dir = 1
},
/mob/living/simple_animal/pet/fox,
/mob/living/basic/pet/fox,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
_maps/map_files/Birdshot/birdshot.dmm
+119 -119
View File
@@ -67,6 +67,19 @@
/obj/machinery/camera/directional/north,
/turf/open/floor/plating,
/area/station/engineering/atmos/project)
"acE" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/closet/crate{
name = "Outdated Weaponry"
},
/obj/effect/spawner/random/armory/barrier_grenades,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/plating,
/area/station/ai_monitored/security/armory)
"acF" = (
/turf/closed/wall/rust,
/area/station/engineering/atmos/project)
@@ -14493,6 +14506,15 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/pumproom)
"fIm" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/machinery/airalarm/directional/west,
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"fIr" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron/small,
@@ -22700,15 +22722,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/engineering/break_room)
"iAt" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/machinery/airalarm/directional/west,
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"iAy" = (
/obj/structure/table,
/obj/item/clothing/shoes/sneakers/orange{
@@ -23413,19 +23426,6 @@
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"iNK" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/closet/crate{
name = "Outdated Weaponry"
},
/obj/effect/spawner/random/armory/barrier_grenades,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/plating,
/area/station/ai_monitored/security/armory)
"iNL" = (
/obj/machinery/door/airlock/wood{
desc = "Sessions held every Friday.";
@@ -26639,13 +26639,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/cargo/storage)
"jWb" = (
/obj/machinery/light/cold/directional/west,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/status_display/ai/directional/south,
/obj/machinery/pdapainter/medbay,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
"jWd" = (
/obj/structure/cable,
/obj/item/kirbyplants/random/fullysynthetic,
@@ -26866,12 +26859,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
@@ -36327,6 +36314,15 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"npQ" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/item/radio/intercom/directional/west,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"npS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -38917,6 +38913,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons)
"ooG" = (
/obj/effect/turf_decal/siding/dark_red/corner{
dir = 8
},
/obj/machinery/light/cold/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"ooK" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -41643,15 +41648,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"pon" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/item/radio/intercom/directional/west,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"pox" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49032,6 +49028,16 @@
/obj/effect/landmark/start/botanist,
/turf/open/floor/iron/white/small,
/area/station/service/hydroponics)
"rBP" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"rBQ" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white/small,
@@ -51107,18 +51113,6 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/kitchen/small,
/area/station/maintenance/aft)
"skO" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/dark_red/corner{
dir = 1
},
/obj/structure/rack,
/obj/machinery/light/cold/directional/south,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/obj/item/gun/energy/e_gun/dragnet,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"skP" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -54399,6 +54393,32 @@
dir = 1
},
/area/station/engineering/atmos)
"toP" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
},
/obj/structure/table/wood,
/obj/machinery/recharger{
pixel_x = 5;
pixel_y = 3
},
/obj/item/storage/wallet/random{
pixel_x = -7;
pixel_y = 1
},
/obj/item/assembly/flash/handheld{
pixel_x = -6;
pixel_y = 5
},
/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,
/turf/open/floor/plating,
/area/station/command/heads_quarters/hop)
"toT" = (
/obj/structure/flora/rock/pile/jungle/style_random,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -54602,14 +54622,6 @@
/obj/structure/sign/warning/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"trK" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"trS" = (
/obj/effect/decal/cleanable/glass,
/obj/structure/grille,
@@ -58737,6 +58749,18 @@
/obj/machinery/duct,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
"uJr" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/dark_red/corner{
dir = 1
},
/obj/structure/rack,
/obj/machinery/light/cold/directional/south,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/obj/item/gun/energy/e_gun/dragnet,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"uJD" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
@@ -58847,15 +58871,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/spacebridge)
"uLE" = (
/obj/effect/turf_decal/siding/dark_red/corner{
dir = 8
},
/obj/machinery/light/cold/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/autoname/directional/north,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"uLO" = (
/obj/item/stack/sheet/cardboard{
amount = 14
@@ -60642,16 +60657,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"voX" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"vpb" = (
/obj/machinery/door/airlock/hatch{
name = "Tool Supply Corridor"
@@ -64084,32 +64089,6 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
"wqi" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
},
/obj/structure/table/wood,
/obj/machinery/recharger{
pixel_x = 5;
pixel_y = 3
},
/obj/item/storage/wallet/random{
pixel_x = -7;
pixel_y = 1
},
/obj/item/assembly/flash/handheld{
pixel_x = -6;
pixel_y = 5
},
/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,
/turf/open/floor/plating,
/area/station/command/heads_quarters/hop)
"wqj" = (
/turf/closed/wall,
/area/station/commons/toilet/restrooms)
@@ -67521,6 +67500,12 @@
"xnE" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/entry)
"xnG" = (
/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)
"xnQ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -68135,6 +68120,13 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"xvt" = (
/obj/machinery/light/cold/directional/west,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/status_display/ai/directional/south,
/obj/machinery/pdapainter/medbay,
/turf/open/floor/wood/parquet,
/area/station/command/heads_quarters/cmo)
"xvv" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70336,6 +70328,14 @@
/obj/machinery/light/cold/directional/east,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"xYe" = (
/obj/effect/turf_decal/siding/dark_red{
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark/small,
/area/station/ai_monitored/security/armory)
"xYj" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -84377,10 +84377,10 @@ qVP
blb
xkt
bCr
trK
iAt
pon
voX
xYe
fIm
npQ
rBP
fQo
syk
bKE
@@ -85147,12 +85147,12 @@ rui
qVP
blb
xkt
uLE
ooG
mVt
gJa
huN
jBr
skO
uJr
syk
nDx
iLc
@@ -85405,7 +85405,7 @@ qVP
blb
xkt
kJp
iNK
acE
xkt
ntf
uMT
@@ -93323,7 +93323,7 @@ qoD
pLr
qoD
uVT
wqi
toP
iwv
iLC
iLC
@@ -99059,7 +99059,7 @@ xqg
pKS
bkY
lVP
jWb
xvt
wgL
hgF
pVK
@@ -101553,7 +101553,7 @@ xRH
gcz
lHW
jOU
jZs
xnG
wSZ
lFg
xqC
_maps/map_files/Deltastation/DeltaStation2.dmm
+779 -779
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+104 -104
View File
@@ -852,12 +852,6 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
"apL" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"apM" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -2425,6 +2419,22 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
"aPS" = (
/obj/machinery/button/door/directional/east{
id = "armory";
name = "Armory Shutters";
pixel_x = -9;
pixel_y = 30;
req_access = list("armory")
},
/obj/structure/rack,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
"aPV" = (
/obj/effect/spawner/random/trash/mess,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6379,6 +6389,14 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark,
/area/mine/mechbay)
"bYg" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"bYm" = (
/obj/structure/chair/pew{
dir = 1
@@ -10612,6 +10630,17 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
"dkB" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north{
layer = 2.9
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"dkK" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/stripes/line,
@@ -10905,17 +10934,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
"dpX" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north{
layer = 2.9
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"dqg" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/secure_area/directional/south,
@@ -15271,14 +15289,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/service/bar)
"eLE" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
"eLS" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -27034,6 +27044,11 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
"iFL" = (
/obj/structure/bed/dogbed/renault,
/mob/living/basic/pet/fox/renault,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"iFX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27790,15 +27805,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
"iSd" = (
/obj/structure/rack,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"iSf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31924,6 +31930,13 @@
},
/turf/open/floor/iron/dark,
/area/station/tcommsat/computer)
"kiY" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"kjw" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/machinery/camera/directional/south{
@@ -35390,11 +35403,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,
@@ -38564,22 +38572,6 @@
/obj/machinery/shower/directional/west,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"mqz" = (
/obj/machinery/button/door/directional/east{
id = "armory";
name = "Armory Shutters";
pixel_x = -9;
pixel_y = 30;
req_access = list("armory")
},
/obj/structure/rack,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
"mqD" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/wood,
@@ -40967,13 +40959,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
"ngC" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"ngH" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/stripes/line{
@@ -42671,19 +42656,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
"nFg" = (
/obj/structure/table,
/obj/item/paper_bin/carbon{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
/obj/item/stamp/head/hop,
/obj/item/storage/wallet/random{
pixel_x = 9
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
"nFk" = (
/obj/effect/landmark/start/cyborg,
/obj/structure/cable,
@@ -42797,6 +42769,14 @@
},
/turf/open/floor/glass/reinforced,
/area/station/engineering/atmos/pumproom)
"nGK" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory/upper)
"nGQ" = (
/obj/machinery/flasher/directional/north{
id = "Cell 3"
@@ -46591,6 +46571,19 @@
dir = 9
},
/area/station/science/lab)
"oPt" = (
/obj/structure/table,
/obj/item/paper_bin/carbon{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
/obj/item/stamp/head/hop,
/obj/item/storage/wallet/random{
pixel_x = 9
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
"oPv" = (
/obj/machinery/turretid{
control_area = "/area/station/ai_monitored/turret_protected/aisat/service";
@@ -49191,17 +49184,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"pHi" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north{
layer = 2.9
},
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"pHy" = (
/obj/structure/rack,
/obj/item/clothing/mask/breath,
@@ -57671,6 +57653,15 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
"srX" = (
/obj/structure/rack,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"srY" = (
/obj/machinery/deepfryer,
/turf/open/floor/iron/cafeteria,
@@ -64479,14 +64470,6 @@
/obj/structure/table,
/turf/open/floor/iron,
/area/station/cargo/office)
"uDt" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"uDy" = (
/obj/item/book/bible,
/obj/structure/cable,
@@ -67552,6 +67535,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"vDx" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"vDy" = (
/obj/structure/sign/poster/official/safety_report/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -67810,6 +67799,17 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
"vHM" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north{
layer = 2.9
},
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark/textured,
/area/station/ai_monitored/security/armory)
"vHR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -167392,7 +167392,7 @@ dHw
qhS
jaW
yiL
ngC
kiY
oqb
uBs
uBs
@@ -167649,7 +167649,7 @@ oZR
oVY
pez
yiL
iSd
srX
cxO
xuA
tuc
@@ -168163,11 +168163,11 @@ mlX
oVY
pez
yiL
apL
vDx
cxO
xuA
dpX
uDt
dkB
bYg
yiL
qLD
bbY
@@ -168680,7 +168680,7 @@ yiL
agF
tgP
rGh
pHi
vHM
wyF
yiL
szz
@@ -233442,7 +233442,7 @@ oSC
ovV
hEC
feJ
mqz
aPS
pdK
lyG
apS
@@ -233764,7 +233764,7 @@ rpu
ybI
nnR
tuz
nFg
oPt
bhK
rAA
cpm
@@ -233960,7 +233960,7 @@ mgZ
tDL
lyG
lok
eLE
nGK
feJ
uVu
aKq
@@ -239406,7 +239406,7 @@ tEd
lpM
eEC
aTw
lmo
iFL
hpe
wwB
mBX
_maps/map_files/MetaStation/MetaStation.dmm
+144 -144
View File
@@ -6312,14 +6312,6 @@
/obj/structure/sign/warning/secure_area/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
"cuY" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"cuZ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -7083,6 +7075,17 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/carpet,
/area/station/commons/dorms)
"cKN" = (
/obj/structure/table/wood,
/obj/structure/cable,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 4;
pixel_x = -1
},
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"cLa" = (
/obj/structure/weightmachine,
/obj/effect/turf_decal/tile/dark_red/half/contrasted,
@@ -7872,14 +7875,6 @@
"daC" = (
/turf/open/floor/wood,
/area/station/service/lawoffice)
"daO" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"daT" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/floor/iron,
@@ -10134,6 +10129,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"dRX" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"dRY" = (
/obj/structure/chair/office,
/obj/effect/landmark/start/hangover,
@@ -14123,6 +14124,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/holding_cell)
"fnO" = (
/obj/structure/rack,
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"foP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14539,6 +14549,14 @@
},
/turf/open/floor/wood,
/area/station/commons/dorms)
"fys" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"fyz" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
@@ -18336,6 +18354,15 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
"gTs" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"gTt" = (
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
@@ -20054,15 +20081,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/hallway/secondary/entry)
"hxF" = (
/obj/structure/rack,
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"hxV" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/line{
@@ -20297,12 +20315,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"hBR" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"hBY" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -24872,6 +24884,14 @@
/obj/item/shard,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
"jcc" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"jcd" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37756,16 +37776,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"nEL" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/paper_bin{
pixel_x = -2;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"nEZ" = (
/obj/machinery/plate_press,
/obj/effect/turf_decal/bot,
@@ -37853,17 +37863,6 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/wood,
/area/station/commons/lounge)
"nHn" = (
/obj/structure/table/wood,
/obj/structure/cable,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 4;
pixel_x = -1
},
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"nHB" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41181,16 +41180,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{
@@ -44322,6 +44311,38 @@
},
/turf/open/floor/plating,
/area/station/maintenance/central)
"qaN" = (
/obj/structure/table/wood,
/obj/machinery/button/ticket_machine{
pixel_x = 32
},
/obj/machinery/light_switch/directional/south{
pixel_x = 6;
pixel_y = -34
},
/obj/machinery/button/door/directional/south{
id = "hop";
name = "Privacy Shutters Control";
pixel_x = -6;
req_access = list("hop")
},
/obj/item/paper_bin/carbon{
pixel_x = -2;
pixel_y = 4
},
/obj/item/stamp/head/hop{
pixel_x = -4;
pixel_y = 4
},
/obj/machinery/button/door/directional/south{
id = "hopqueue";
name = "Queue Shutters Control";
pixel_x = -6;
pixel_y = -34;
req_access = list("hop")
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"qaP" = (
/obj/effect/turf_decal/plaque{
icon_state = "L3"
@@ -49358,14 +49379,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rRf" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"rRm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -51447,14 +51460,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"sDw" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"sDC" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55231,6 +55236,14 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"tTP" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"tTT" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -56854,15 +56867,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/engineering/main)
"uwg" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"uwh" = (
/obj/structure/chair/comfy{
dir = 1
@@ -59487,6 +59491,16 @@
},
/turf/open/floor/plating,
/area/station/cargo/storage)
"vsU" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/item/paper_bin{
pixel_x = -2;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"vth" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -59585,6 +59599,16 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"vuN" = (
/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)
"vuP" = (
/obj/item/target/syndicate,
/obj/structure/training_machine,
@@ -62585,19 +62609,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
"wya" = (
/obj/structure/rack,
/obj/machinery/requests_console/directional/north{
department = "Security";
name = "Security Requests Console"
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/bulletproof_armor,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"wyn" = (
/obj/machinery/hydroponics/soil,
/obj/item/shovel/spade,
@@ -63879,6 +63890,14 @@
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron/white,
/area/station/science/lobby)
"wXu" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"wXF" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/lesser)
@@ -63948,38 +63967,6 @@
"wYB" = (
/turf/closed/wall,
/area/station/hallway/secondary/service)
"wYG" = (
/obj/structure/table/wood,
/obj/machinery/button/ticket_machine{
pixel_x = 32
},
/obj/machinery/light_switch/directional/south{
pixel_x = 6;
pixel_y = -34
},
/obj/machinery/button/door/directional/south{
id = "hop";
name = "Privacy Shutters Control";
pixel_x = -6;
req_access = list("hop")
},
/obj/item/paper_bin/carbon{
pixel_x = -2;
pixel_y = 4
},
/obj/item/stamp/head/hop{
pixel_x = -4;
pixel_y = 4
},
/obj/machinery/button/door/directional/south{
id = "hopqueue";
name = "Queue Shutters Control";
pixel_x = -6;
pixel_y = -34;
req_access = list("hop")
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"wZe" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel Office"
@@ -64023,6 +64010,19 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
"wZO" = (
/obj/structure/rack,
/obj/machinery/requests_console/directional/north{
department = "Security";
name = "Security Requests Console"
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/bulletproof_armor,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"wZU" = (
/obj/structure/chair/office{
dir = 4
@@ -90709,7 +90709,7 @@ oIa
pJR
oXT
sRT
nEL
vsU
gaU
flu
jbd
@@ -90969,7 +90969,7 @@ kfA
rWH
oOE
aVd
nHn
cKN
mig
wMx
cMQ
@@ -92511,7 +92511,7 @@ pJR
lJn
psy
htG
wYG
qaN
pJR
uwC
ndS
@@ -93498,7 +93498,7 @@ dxe
wTO
xxZ
anl
uwg
gTs
apJ
lDe
qGQ
@@ -93755,7 +93755,7 @@ wrb
uQK
dPL
aeq
wya
wZO
apJ
lDe
qGQ
@@ -94012,7 +94012,7 @@ aeq
aeq
aeq
aeq
hBR
dRX
riY
aeq
qid
@@ -94266,8 +94266,8 @@ aaa
aeq
xCo
dAr
rRf
cuY
tTP
fys
tgy
agc
apM
@@ -95037,10 +95037,10 @@ aaa
aaa
aeq
wzF
sDw
jcc
eew
hxF
daO
fnO
wXu
kaC
anl
vDh
@@ -97910,7 +97910,7 @@ jxv
sqJ
gPA
lZM
oRT
vuN
syo
lSz
vQe
_maps/map_files/NorthStar/north_star.dmm
+116 -116
View File
@@ -7049,6 +7049,13 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"bGV" = (
/obj/machinery/door/window/brigdoor{
dir = 1
},
/mob/living/basic/pet/fox,
/turf/open/floor/noslip,
/area/station/maintenance/floor1/port)
"bHh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/line{
@@ -7881,6 +7888,14 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port)
"bSJ" = (
/obj/structure/rack,
/obj/item/storage/secure/safe/directional/east,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"bSV" = (
/obj/machinery/door/airlock/medical{
name = "Psychologist's Office"
@@ -11058,13 +11073,6 @@
},
/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/effect/spawner/random/armory/laser_gun,
/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,
@@ -13110,14 +13118,6 @@
dir = 1
},
/area/station/cargo/office)
"dnI" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/structure/cable,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"dnJ" = (
/obj/structure/railing{
dir = 4
@@ -15070,6 +15070,15 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/bar)
"dNw" = (
/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)
"dNx" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering"
@@ -22582,20 +22591,6 @@
dir = 4
},
/area/station/ai_monitored/command/storage/eva)
"fQG" = (
/obj/structure/table/wood,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 6;
pixel_x = -2
},
/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{
@@ -26645,6 +26640,14 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/medical/medbay/central)
"gSD" = (
/obj/structure/rack,
/obj/structure/sign/poster/official/random/directional/east,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"gSS" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
@@ -26772,6 +26775,13 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"gUH" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"gUO" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/purple,
@@ -27434,17 +27444,6 @@
/obj/machinery/light/directional/south,
/turf/open/openspace,
/area/station/service/library)
"hdK" = (
/obj/structure/rack,
/obj/structure/sign/nanotrasen{
pixel_x = 32
},
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/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,
@@ -27941,15 +27940,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
@@ -30340,6 +30330,20 @@
},
/turf/open/floor/wood,
/area/station/commons/dorms/apartment2)
"hSp" = (
/obj/structure/table/wood,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 6;
pixel_x = -2
},
/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)
"hSs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32076,6 +32080,13 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"ira" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"irf" = (
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark/side{
@@ -32684,6 +32695,13 @@
icon_state = "snow8"
},
/area/station/hallway/floor2/fore)
"izj" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"izl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -33422,14 +33440,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard/fore)
"iKy" = (
/obj/structure/rack,
/obj/item/storage/secure/safe/directional/east,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"iKz" = (
/obj/structure/ladder,
/obj/structure/disposalpipe/segment{
@@ -34981,6 +34991,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
"jeQ" = (
/obj/structure/table/reinforced,
/obj/machinery/camera/directional/south{
c_tag = "Armory - Interior"
},
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/structure/cable,
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"jeR" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/iron/dark/smooth_large,
@@ -39901,13 +39921,6 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/lawoffice)
"kvk" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"kvw" = (
/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
@@ -42885,13 +42898,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{
@@ -52419,6 +52425,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/maintenance/floor2/starboard/aft)
"nzV" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/structure/cable,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"nAb" = (
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/effect/decal/cleanable/dirt,
@@ -56258,14 +56272,6 @@
"ozt" = (
/turf/open/openspace,
/area/station/medical/psychology)
"ozE" = (
/obj/structure/table/reinforced,
/obj/structure/sign/poster/official/random/directional/south,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/rubbershot,
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"ozF" = (
/obj/effect/turf_decal/bot,
/obj/machinery/light/small/directional/east,
@@ -57143,16 +57149,6 @@
/obj/structure/railing,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
"oMn" = (
/obj/structure/table/reinforced,
/obj/machinery/camera/directional/south{
c_tag = "Armory - Interior"
},
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/structure/cable,
/obj/effect/spawner/random/armory/barrier_grenades,
/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,
@@ -57566,14 +57562,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lower)
"oSf" = (
/obj/structure/rack,
/obj/structure/sign/poster/official/random/directional/east,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"oSg" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -62992,13 +62980,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
"qsN" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/e_gun,
/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,
@@ -82399,6 +82380,17 @@
/obj/machinery/door/window/right/directional/west,
/turf/open/floor/grass,
/area/station/security/courtroom)
"vCS" = (
/obj/structure/rack,
/obj/structure/sign/nanotrasen{
pixel_x = 32
},
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"vDf" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -90265,6 +90257,14 @@
},
/turf/open/floor/wood,
/area/station/service/kitchen/diner)
"xCR" = (
/obj/structure/table/reinforced,
/obj/structure/sign/poster/official/random/directional/south,
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/effect/spawner/random/armory/rubbershot,
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"xCS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -122887,7 +122887,7 @@ dyS
xgH
bvi
eVk
lji
bGV
xgH
wVn
xgH
@@ -251880,7 +251880,7 @@ qrd
qrd
qrd
iHm
fQG
hSp
bQe
twg
pPf
@@ -311243,7 +311243,7 @@ glw
aNs
gZJ
per
hkj
dNw
jvM
nSV
pHT
@@ -321036,7 +321036,7 @@ sHY
rDZ
cbw
lOp
kvk
ira
dtX
oOW
qjr
@@ -321293,7 +321293,7 @@ sHY
xIP
cbw
lOp
qsN
izj
cUd
lXm
kdh
@@ -321550,11 +321550,11 @@ sHY
hAP
qtQ
owC
cJf
gUH
fCS
mqB
lOp
ozE
xCR
iXF
sPs
ycM
@@ -321807,11 +321807,11 @@ sHY
cAt
cbw
xOY
dnI
nzV
xDG
qqE
eLg
oMn
jeQ
uXo
sPs
orf
@@ -322321,9 +322321,9 @@ oDd
dPH
vuf
nkr
oSf
iKy
hdK
gSD
bSJ
vCS
gMo
jOc
iXF
_maps/map_files/tramstation/tramstation.dmm
+108 -108
View File
@@ -4895,15 +4895,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aCO" = (
/obj/structure/table/wood,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 4
},
/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{
@@ -5279,12 +5270,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
"aFA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"aFP" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -10035,13 +10020,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lobby)
"caF" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"caP" = (
/obj/structure/cable,
/obj/structure/cable/layer1,
@@ -20281,6 +20259,17 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/cargo/office)
"fSR" = (
/obj/machinery/door/airlock{
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)
"fSY" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen{
@@ -24400,6 +24389,11 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/lab)
"hBS" = (
/obj/structure/bed/dogbed/renault,
/mob/living/basic/pet/fox/renault,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"hBV" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -24754,6 +24748,15 @@
"hJl" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload)
"hJv" = (
/obj/structure/table/wood,
/obj/item/storage/backpack/satchel/leather/withwallet{
pixel_y = 4
},
/obj/item/hand_labeler,
/obj/item/stack/package_wrap,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"hJA" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
/obj/machinery/meter,
@@ -26103,6 +26106,13 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"ikb" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/spawner/random/armory/disablers,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"iko" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -26217,13 +26227,6 @@
},
/turf/open/floor/glass,
/area/station/command/meeting_room)
"imB" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"ina" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -26954,17 +26957,6 @@
/obj/structure/lattice/catwalk,
/turf/open/openspace/airless,
/area/station/asteroid)
"iAU" = (
/obj/structure/rack,
/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,
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"iBa" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -36389,12 +36381,6 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"lTf" = (
/obj/machinery/door/airlock{
name = "Barber Storage"
},
/turf/open/floor/plating,
/area/station/service/barber)
"lTM" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 8
@@ -40315,11 +40301,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
@@ -41259,6 +41240,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/medical/virology)
"nIX" = (
/obj/structure/rack,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"nJr" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -42842,14 +42831,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/station/service/library)
"olh" = (
/obj/structure/rack,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/bulletproof_armor,
/obj/effect/spawner/random/armory/bulletproof_helmet,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"olw" = (
/obj/structure/industrial_lift/tram/white,
/obj/structure/fluff/tram_rail,
@@ -43202,6 +43183,12 @@
dir = 4
},
/area/station/command/gateway)
"otd" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/barrier_grenades,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"otf" = (
/obj/structure/chair,
/obj/effect/turf_decal/trimline/neutral/filled/line,
@@ -43991,18 +43978,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"oMM" = (
/obj/structure/rack,
/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,
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"oMU" = (
/obj/structure/railing/corner{
dir = 4
@@ -48659,6 +48634,18 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
"qwC" = (
/obj/structure/rack,
/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,
/obj/effect/spawner/random/armory/e_gun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"qwH" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/wood,
@@ -49089,14 +49076,6 @@
"qEH" = (
/turf/closed/wall,
/area/station/solars/port)
"qEM" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"qFf" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -49489,6 +49468,12 @@
},
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
"qMd" = (
/obj/machinery/door/airlock{
name = "Barber Storage"
},
/turf/open/floor/plating,
/area/station/service/barber)
"qMf" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 8
@@ -52926,12 +52911,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"sab" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/barrier_grenades,
/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,
@@ -54223,6 +54202,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
"svh" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/spawner/random/armory/shotgun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"svA" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -57749,6 +57735,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
"tGG" = (
/obj/structure/rack,
/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,
/obj/effect/spawner/random/armory/laser_gun,
/turf/open/floor/iron,
/area/station/ai_monitored/security/armory)
"tHb" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -63125,6 +63122,12 @@
/obj/structure/sink/directional/west,
/turf/open/floor/iron/freezer,
/area/station/science/lower)
"vtr" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/rubbershot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"vtP" = (
/obj/structure/fluff/tram_rail,
/obj/structure/industrial_lift/tram,
@@ -66243,17 +66246,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"wAY" = (
/obj/machinery/door/airlock{
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,
@@ -67150,6 +67142,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
"wUI" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/spawner/random/armory/riot_armor,
/obj/effect/spawner/random/armory/riot_helmet,
/obj/effect/spawner/random/armory/riot_shield,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
"wUL" = (
/obj/machinery/status_display/evac/directional/north,
/obj/machinery/fax{
@@ -105596,13 +105596,13 @@ abM
abM
abM
abM
wAY
fSR
gpq
tqd
usz
lML
fFl
lTf
qMd
eep
eep
mGw
@@ -151863,7 +151863,7 @@ cCR
aBV
wHT
lPd
aCO
hJv
vBn
eDZ
sik
@@ -153623,12 +153623,12 @@ aaa
aaa
aaa
dEv
qEM
wUI
trm
epT
hgn
mKP
aFA
vtr
dEv
avP
rZA
@@ -153880,7 +153880,7 @@ dEv
dEv
dEv
dEv
olh
nIX
exx
ouM
iub
@@ -154139,7 +154139,7 @@ gxf
gxf
dst
xYC
imB
svh
eIR
iub
hgn
@@ -154395,9 +154395,9 @@ pvi
yjm
yjm
hPs
iAU
tGG
lAC
oMM
qwC
aeX
yjm
oby
@@ -154648,12 +154648,12 @@ aaa
aaa
aaa
dEv
sab
otd
uPZ
eSj
dst
xYC
caF
ikb
avf
avg
hgn
@@ -158542,7 +158542,7 @@ xEo
xEo
nFZ
jXU
npH
hBS
xEo
aaS
aaS
_maps/shuttles/emergency_hugcage.dmm
+1 -1
View File
@@ -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" = (
code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
+10
View File
@@ -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 ..()
code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm
+6
View File
@@ -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")
code/datums/memory/_memory.dm
+1 -1
View File
@@ -263,6 +263,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,
)
code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm
+1 -1
View File
@@ -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,
code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
+2 -2
View File
@@ -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,
)
code/modules/antagonists/traitor/objectives/kill_pet.dm
+1 -1
View File
@@ -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(
code/modules/cargo/packs/livestock.dm
+4 -3
View File
@@ -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
code/modules/holodeck/holo_effect.dm
+1 -1
View File
@@ -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,
code/modules/mob/living/basic/pets/fox.dm
+80
View File
@@ -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
code/modules/mob/living/living.dm
+1 -1
View File
@@ -1398,6 +1398,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,
@@ -1413,7 +1414,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)
code/modules/mob/living/simple_animal/friendly/fox.dm
-43
View File
@@ -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
code/modules/research/experimentor.dm
+1 -1
View File
@@ -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)
code/modules/unit_tests/simple_animal_freeze.dm
-2
View File
@@ -275,8 +275,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,
tgstation.dme
+1 -1
View File
@@ -4023,6 +4023,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"
@@ -4243,7 +4244,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"
tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt
+1
View File
@@ -0,0 +1 @@
/mob/living/simple_animal/pet/fox/@SUBTYPES : /mob/living/basic/pet/fox/@SUBTYPES{@OLD}