cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] Adds a unit test for typepaths that are required to be mapped onto each station map (#74985)

Browse Source 
## About The Pull Request

Inspired by #74967 and #68459 , and the fact that Tramstation regresses
very often -

Adds a unit test, `required_map_items`, which ensures that certain
typepaths which should definitely be mapped onto every map is mapped
onto every map

It can also be used to ensure that items which should not be mapped in
multiple times are not, among other things.

I included a few examples - 
- Min 1, max inf of each head of staff stamps
- Min 1, max 1 departmental order consoles
- Min 1, max inf comms console
- Min 1, max 1 Pun Pun
- Min 1, max 1 Poly
- Min 1, max 1 Ian

If, in the future, a mapper decides they (for some reason) do not want a
certain previously-required item on their map, the test can be adjusted
such that it allows excluding or something, but currently it should be
for items which require conscious thought about.

#### QA: Why not make this a linter?

I attempted to make this a linter before realizing two things
1. Someone might make a spawner which spawns the items, or they might
get placed in a locker, in any case this accounts for everything on init
2. Linters run on every map, non-station maps included

So I went with a test

## Why It's Good For The Game

#50468
#61013
#74967

Why is it always the CMO stamp?

## Changelog

Not necessary (unless I find a map missing something, then this will be
updated)
This commit is contained in:
MrMelbert
2023-05-04 16:20:25 -05:00
committed by GitHub
parent 7aef07fc85
commit 4de3df461e
36 changed files with 202388 additions and 202275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+1 -1
View File
@@ -1192,7 +1192,7 @@
"BL" = (
/obj/structure/table/wood,
/obj/item/folder/white,
/obj/item/stamp/rd,
/obj/item/stamp/head/rd,
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"BM" = (
_maps/RandomRuins/SpaceRuins/waystation.dmm
+246 -246
View File
@@ -14,28 +14,6 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/dorms)
"au" = (
/obj/structure/table/wood,
/obj/effect/mapping_helpers/broken_floor,
/obj/item/clipboard{
pixel_x = -6;
pixel_y = 4
},
/obj/item/stamp{
pixel_x = 7;
pixel_y = 9
},
/obj/item/stamp/denied{
pixel_x = 7;
pixel_y = 4
},
/obj/item/stamp/qm{
pixel_x = 7;
pixel_y = -2
},
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"aO" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/cable,
@@ -93,6 +71,22 @@
/obj/structure/closet/secure_closet/freezer/meat/open,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/waystation/kitchen)
"bR" = (
/mob/living/basic/syndicate/ranged/shotgun/space,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 3;
pixel_y = 10
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 6;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -3;
pixel_y = 1
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"bU" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
@@ -199,6 +193,22 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"dY" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/c45/spent{
pixel_y = 1
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -4;
dir = 1
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"dZ" = (
/obj/structure/chair/stool{
dir = 1;
@@ -274,32 +284,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"fe" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/ammo_casing/c45/spent{
pixel_x = -4;
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -4;
dir = 1
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 5;
pixel_y = -2
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"fg" = (
/obj/machinery/power/shuttle_engine/propulsion,
/turf/open/floor/plating/airless,
@@ -524,22 +508,6 @@
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/waystation/dorms)
"jh" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/c45/spent{
pixel_y = 1
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -4;
dir = 1
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"jv" = (
/obj/structure/grille,
/obj/effect/spawner/structure/window/reinforced,
@@ -726,6 +694,58 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"my" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/item/ammo_casing/c45/spent{
dir = 8
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 4;
pixel_y = 3
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -2;
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -8;
dir = 8
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"mI" = (
/obj/structure/table/wood,
/obj/effect/mapping_helpers/broken_floor,
/obj/item/clipboard{
pixel_x = -6;
pixel_y = 4
},
/obj/item/stamp{
pixel_x = 7;
pixel_y = 9
},
/obj/item/stamp/denied{
pixel_x = 7;
pixel_y = 4
},
/obj/item/stamp/head/qm{
pixel_x = 7;
pixel_y = -2
},
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"mO" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -870,6 +890,17 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/ruin/space/has_grav/waystation/power)
"ou" = (
/obj/structure/chair/office{
dir = 8
},
/obj/structure/cable,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -7;
pixel_y = 14
},
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"ov" = (
/obj/structure/chair/office{
dir = 8
@@ -1063,6 +1094,32 @@
/obj/structure/closet/crate,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"rn" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/ammo_casing/c45/spent{
pixel_x = -4;
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -4;
dir = 1
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 5;
pixel_y = -2
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"ro" = (
/obj/structure/table/reinforced,
/obj/item/disk/holodisk/ruin/waystation,
@@ -1510,21 +1567,6 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"zT" = (
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 6;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 1;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -8;
pixel_y = -5
},
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"zV" = (
/obj/structure/fluff/broken_flooring{
dir = 8;
@@ -1636,14 +1678,6 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"CI" = (
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"CN" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -1889,17 +1923,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"IT" = (
/obj/structure/chair/office{
dir = 8
},
/obj/structure/cable,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -7;
pixel_y = 14
},
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"IU" = (
/obj/structure/table,
/obj/item/folder{
@@ -2295,6 +2318,14 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/powered/waystation/assaultpod)
"Oj" = (
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"Ok" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
@@ -2335,6 +2366,21 @@
/obj/effect/mapping_helpers/airlock/access/all/away/supply,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"Pj" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 3;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -3;
pixel_y = -6
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"Pm" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
@@ -2357,6 +2403,21 @@
/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/ruin/space/has_grav/waystation/cargobay)
"PN" = (
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 6;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 1;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -8;
pixel_y = -5
},
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/waystation/qm)
"PS" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/enzyme{
@@ -2461,57 +2522,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"RR" = (
/obj/effect/decal/cleanable/blood,
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 5;
pixel_y = -2
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 4;
pixel_y = 3
},
/obj/structure/chair/office,
/obj/item/ammo_box/magazine/m45{
start_empty = 1;
pixel_y = -6;
pixel_x = -10
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
pixel_x = -4;
pixel_y = 10
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"RW" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/item/kirbyplants/random,
@@ -2561,22 +2571,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"SJ" = (
/mob/living/basic/syndicate/ranged/shotgun/space,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 3;
pixel_y = 10
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 6;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -3;
pixel_y = 1
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"SL" = (
/obj/structure/grille,
/obj/effect/spawner/structure/window/reinforced,
@@ -2595,31 +2589,6 @@
/obj/item/shell/airlock,
/turf/template_noop,
/area/template_noop)
"To" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 1;
pixel_y = 7
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = -3
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"Tx" = (
/obj/effect/turf_decal/siding/brown{
dir = 8
@@ -2699,6 +2668,57 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"Va" = (
/obj/effect/decal/cleanable/blood,
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 5;
pixel_y = -2
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 4;
pixel_y = 3
},
/obj/structure/chair/office,
/obj/item/ammo_box/magazine/m45{
start_empty = 1;
pixel_y = -6;
pixel_x = -10
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
pixel_x = -4;
pixel_y = 10
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/securestorage)
"Vb" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
@@ -2782,21 +2802,6 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"WP" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = 3;
pixel_y = 1
},
/obj/item/ammo_casing/shotgun/buckshot/spent{
pixel_x = -3;
pixel_y = -6
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/dorms)
"WS" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -2900,6 +2905,31 @@
/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/waystation/kitchen)
"XT" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 1;
pixel_y = 7
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = -3
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 6
},
/obj/item/ammo_casing/c45/spent{
dir = 9;
pixel_x = 2;
pixel_y = -5
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargobay)
"Ya" = (
/turf/template_noop,
/area/template_noop)
@@ -2972,36 +3002,6 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/waystation/dorms)
"ZG" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/item/ammo_casing/c45/spent{
dir = 8
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_y = -4
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 4;
pixel_y = 3
},
/obj/item/ammo_casing/c45/spent{
dir = 8;
pixel_x = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -2;
dir = 8
},
/obj/item/ammo_casing/c45/spent{
pixel_x = 5;
pixel_y = -8;
dir = 8
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"ZJ" = (
/obj/effect/turf_decal/siding/red,
/obj/structure/table/reinforced,
@@ -4136,7 +4136,7 @@ uG
QN
xt
Mk
au
mI
uF
QN
Tx
@@ -4197,8 +4197,8 @@ Ls
Ud
QN
FV
zT
IT
PN
ou
uF
TT
TT
@@ -4312,11 +4312,11 @@ jV
jV
jV
jV
WP
Pj
oa
oa
Id
SJ
bR
xw
jV
QN
@@ -4698,7 +4698,7 @@ Dc
fc
zh
Bi
jh
dY
Ze
tb
Wd
@@ -4760,7 +4760,7 @@ Dc
Qx
SL
jG
ZG
my
xk
tb
FM
@@ -5061,7 +5061,7 @@ Bq
jH
Vb
Xr
fe
rn
Vb
Vb
Vb
@@ -5111,7 +5111,7 @@ yi
vn
LQ
dX
CI
Oj
WS
yi
Jf
@@ -5171,7 +5171,7 @@ pK
pK
yi
Lt
RR
Va
ZJ
er
hd
@@ -5307,7 +5307,7 @@ zI
GS
Zv
Wg
To
XT
bW
Kn
bW
_maps/RandomZLevels/moonoutpost19.dmm
+58595 -58595
View File
File diff suppressed because it is too large Load Diff
_maps/RandomZLevels/undergroundoutpost45.dmm
+514 -514
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Birdshot/birdshot.dmm
+133896 -133896
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+150 -150
View File
@@ -6078,18 +6078,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/theater)
"byr" = (
/obj/structure/cable,
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/components/unary/thermomachine/heater{
dir = 8
},
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
"byy" = (
/obj/machinery/newscaster/directional/east,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -22528,6 +22516,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
"fFj" = (
/obj/structure/cable,
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/components/unary/thermomachine/heater{
dir = 8
},
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
"fFr" = (
/obj/machinery/computer/atmos_control{
dir = 8
@@ -23178,6 +23178,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"fOx" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
"fOz" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -29501,24 +29513,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"hrq" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/clipboard,
/obj/item/pen/red{
pixel_x = 1
},
/obj/item/stamp/hos{
pixel_x = 1;
pixel_y = -1
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
"hrs" = (
/obj/structure/lattice,
/obj/structure/sign/warning/secure_area/directional/north,
@@ -34335,12 +34329,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"iBB" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stamp/rd,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
"iBO" = (
/obj/machinery/power/turbine/inlet_compressor,
/turf/open/floor/engine,
@@ -41919,18 +41907,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/port)
"kse" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/burnchamber)
"ksf" = (
/obj/structure/sign/departments/court/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42804,12 +42780,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/brig)
"kDE" = (
/obj/structure/sign/delamination_counter/directional/west,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/engine_access,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"kDL" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -46166,17 +46136,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
"lwM" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/folder/blue{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stamp/ce,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"lwZ" = (
/turf/closed/wall,
/area/station/medical/medbay)
@@ -48664,16 +48623,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/security/brig)
"meV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/stamp/qm,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"meW" = (
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/tile/green,
@@ -54512,19 +54461,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"nFj" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
/obj/item/stamp/cmo,
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"nFq" = (
/obj/machinery/computer/warrant{
dir = 1
@@ -57660,6 +57596,18 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"owX" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/burnchamber)
"owY" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/iron{
@@ -61399,6 +61347,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
"pwT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/pen/fourcolor,
/obj/item/stamp/head/captain,
/obj/machinery/door/window/brigdoor/left/directional/north{
name = "Captain's Desk";
req_access = list("captain")
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"pwY" = (
/obj/structure/lattice/catwalk,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -64038,21 +64001,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"pZs" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/pen/fourcolor,
/obj/item/stamp/captain,
/obj/machinery/door/window/brigdoor/left/directional/north{
name = "Captain's Desk";
req_access = list("captain")
},
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"pZy" = (
/obj/structure/closet/secure_closet/medical3,
/obj/effect/turf_decal/bot,
@@ -64314,6 +64262,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/department/security)
"qcj" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/clipboard,
/obj/item/pen/red{
pixel_x = 1
},
/obj/item/stamp/head/hos{
pixel_x = 1;
pixel_y = -1
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
"qcu" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod 3";
@@ -72655,18 +72621,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/commons/locker)
"sjg" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
"sjh" = (
/obj/structure/statue/sandstone/venus{
name = "Justice"
@@ -76953,6 +76907,12 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
"tou" = (
/obj/structure/sign/delamination_counter/directional/west,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/engine_access,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"toy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -77486,6 +77446,12 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/carpet/blue,
/area/station/commons/vacant_room/office)
"tud" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stamp/head/rd,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
"tug" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -77595,6 +77561,19 @@
},
/turf/open/floor/plating,
/area/station/science/lab)
"tuP" = (
/obj/structure/table/wood,
/obj/item/paper_bin/carbon,
/obj/item/stamp/head/hop,
/obj/machinery/requests_console/directional/north{
announcementConsole = 1;
anon_tips_receiver = 1;
assistance_requestable = 1;
department = "Head of Personnel's Desk";
name = "Head of Personnel's Requests Console"
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"tuQ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -78614,16 +78593,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/maintenance/port)
"tIh" = (
/obj/effect/turf_decal/siding/purple/corner,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/freezerchamber)
"tIK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -80322,19 +80291,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"ucZ" = (
/obj/structure/table/wood,
/obj/item/paper_bin/carbon,
/obj/item/stamp/hop,
/obj/machinery/requests_console/directional/north{
announcementConsole = 1;
anon_tips_receiver = 1;
assistance_requestable = 1;
department = "Head of Personnel's Desk";
name = "Head of Personnel's Requests Console"
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"udb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -83442,6 +83398,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"uQZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/stamp/head/qm,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"uRe" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 10
@@ -83919,6 +83885,16 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/security/courtroom)
"uXN" = (
/obj/effect/turf_decal/siding/purple/corner,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/freezerchamber)
"uXU" = (
/obj/structure/disposaloutlet{
dir = 8
@@ -84066,6 +84042,19 @@
/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"uZm" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
/obj/item/stamp/head/cmo,
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"uZs" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -86565,6 +86554,17 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/morgue)
"vEZ" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/folder/blue{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stamp/head/ce,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"vFa" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -118932,7 +118932,7 @@ eHy
qJs
cxp
sHT
kDE
tou
tsa
bPI
sHT
@@ -119378,7 +119378,7 @@ aaa
qYo
aaa
edx
byr
fFj
rhC
dnM
gFb
@@ -119943,7 +119943,7 @@ oez
bAR
xqG
gsV
lwM
vEZ
fzY
tEE
tEw
@@ -127180,7 +127180,7 @@ sLY
bCc
pML
uzo
iBB
tud
dGp
czL
epF
@@ -127891,7 +127891,7 @@ xtp
xtp
xtp
nFX
sjg
fOx
thz
ydg
xbO
@@ -129769,7 +129769,7 @@ pdH
qLq
hGI
esH
kse
owX
asW
nSb
nSb
@@ -130283,7 +130283,7 @@ kVF
fWx
lzo
vbO
tIh
uXN
eqB
eyH
eyH
@@ -132797,7 +132797,7 @@ aiO
hWq
mGw
pRS
ucZ
tuP
lNA
ozz
lNA
@@ -133876,7 +133876,7 @@ uws
dQT
vuS
pMF
nFj
uZm
wqz
loe
gaC
@@ -138192,7 +138192,7 @@ pXK
mBd
btZ
fPn
pZs
pwT
jim
eoF
cXB
@@ -143046,7 +143046,7 @@ aad
aJE
ejX
aAU
meV
uQZ
xhJ
vMd
tgX
@@ -152310,7 +152310,7 @@ bRF
gby
jfR
lPV
hrq
qcj
bAS
uTM
nHJ
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+151 -151
View File
@@ -979,15 +979,6 @@
},
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
"aqR" = (
/obj/machinery/power/terminal{
dir = 1
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"aqT" = (
/obj/machinery/conveyor{
dir = 8;
@@ -1414,6 +1405,11 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/science/research)
"axf" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/machinery/modular_computer/console/preset/id,
/turf/open/floor/iron,
/area/station/command/bridge)
"axm" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -10162,16 +10158,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"dez" = (
/obj/structure/table,
/obj/item/folder/white,
/obj/item/pen,
/obj/item/stamp/rd{
pixel_x = 3;
pixel_y = -2
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
"deN" = (
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/misc/asteroid/snow/icemoon,
@@ -10265,11 +10251,6 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
/turf/open/floor/wood,
/area/station/service/library)
"dgG" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/obj/machinery/modular_computer/console/preset/id,
/turf/open/floor/iron,
/area/station/command/bridge)
"dgZ" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/cable,
@@ -15688,16 +15669,6 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
"eUQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
name = "Gas to Filter"
},
/obj/effect/mapping_helpers/airalarm/engine_access,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"eUR" = (
/obj/structure/table,
/obj/machinery/button/door/directional/west{
@@ -16109,6 +16080,35 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"fad" = (
/obj/machinery/camera/directional/west{
c_tag = "Security - HoS Office"
},
/obj/item/flashlight/lamp/green{
on = 0;
pixel_x = -6;
pixel_y = 16
},
/obj/structure/table/wood,
/obj/item/paper_bin{
pixel_x = 8;
pixel_y = 3
},
/obj/item/stamp/head/hos{
pixel_x = 10;
pixel_y = 6
},
/obj/machinery/recharger{
pixel_x = -4;
pixel_y = -1
},
/obj/machinery/airalarm/directional/west,
/obj/item/phone{
pixel_x = -9;
pixel_y = 7
},
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
"faf" = (
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/plating,
@@ -17725,12 +17725,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/service/bar)
"fDu" = (
/obj/structure/flora/bush/snow/style_random,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/obj/machinery/airalarm/directional/west,
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"fDv" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -19507,17 +19501,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"ghI" = (
/obj/machinery/airalarm/directional/east,
/obj/structure/extinguisher_cabinet/directional/north,
/obj/machinery/light/directional/east,
/obj/structure/table/glass,
/obj/item/folder/white,
/obj/item/stamp/cmo,
/obj/item/clothing/neck/stethoscope,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"ghJ" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -32775,6 +32758,12 @@
},
/turf/open/floor/wood/parquet,
/area/station/commons/lounge)
"kwz" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/head/captain,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"kwK" = (
/obj/effect/turf_decal/tile/purple/half,
/turf/open/floor/iron/half,
@@ -33397,6 +33386,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/lobby)
"kGQ" = (
/obj/structure/table,
/obj/item/stamp/head/qm,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/qm)
"kHb" = (
/obj/structure/closet/secure_closet/personal{
anchored = 1
@@ -36998,15 +36992,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"lOs" = (
/mob/living/simple_animal/hostile/retaliate/goat{
atmos_requirements = list("min_oxy"=1,"max_oxy"=0,"min_plas"=0,"max_plas"=1,"min_co2"=0,"max_co2"=5,"min_n2"=0,"max_n2"=0);
desc = "Not known for their pleasant disposition. This one seems a bit more hardy to the cold.";
minbodytemp = 150;
name = "Snowy Pete"
},
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"lOt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/window/left/directional/east,
@@ -39292,6 +39277,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"mDw" = (
/obj/structure/table/reinforced,
/obj/effect/landmark/event_spawn,
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/paper/monitorkey,
/obj/item/stamp/head/ce,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"mDX" = (
/turf/open/floor/engine/n2,
/area/station/engineering/atmos)
@@ -42476,35 +42470,6 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
"nBx" = (
/obj/machinery/camera/directional/west{
c_tag = "Security - HoS Office"
},
/obj/item/flashlight/lamp/green{
on = 0;
pixel_x = -6;
pixel_y = 16
},
/obj/structure/table/wood,
/obj/item/paper_bin{
pixel_x = 8;
pixel_y = 3
},
/obj/item/stamp/hos{
pixel_x = 10;
pixel_y = 6
},
/obj/machinery/recharger{
pixel_x = -4;
pixel_y = -1
},
/obj/machinery/airalarm/directional/west,
/obj/item/phone{
pixel_x = -9;
pixel_y = 7
},
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
"nBB" = (
/obj/machinery/power/smes,
/obj/structure/cable,
@@ -42788,6 +42753,16 @@
/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,
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
"nFk" = (
/obj/effect/landmark/start/cyborg,
/obj/structure/cable,
@@ -43976,11 +43951,6 @@
/obj/item/plate,
/turf/open/floor/iron/checker,
/area/station/maintenance/port/fore)
"nWk" = (
/obj/structure/table,
/obj/item/stamp/qm,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/qm)
"nWy" = (
/obj/structure/sign/poster/official/work_for_a_future,
/turf/closed/wall,
@@ -44346,6 +44316,15 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"odf" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/obj/effect/turf_decal/box/red,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/burnchamber)
"odi" = (
/obj/item/toy/snowball{
pixel_x = 5;
@@ -52092,6 +52071,16 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/turf/open/floor/iron/large,
/area/mine/mechbay)
"qDj" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
name = "Gas to Filter"
},
/obj/effect/mapping_helpers/airalarm/engine_access,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"qDy" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/dark_green,
@@ -56640,6 +56629,12 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/project)
"rZK" = (
/obj/structure/flora/bush/snow/style_random,
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/obj/machinery/airalarm/directional/west,
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"rZN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58383,6 +58378,15 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/large,
/area/mine/eva/lower)
"sCm" = (
/obj/machinery/power/terminal{
dir = 1
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"sCw" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -61670,6 +61674,17 @@
dir = 1
},
/area/station/engineering/lobby)
"tGO" = (
/obj/machinery/airalarm/directional/east,
/obj/structure/extinguisher_cabinet/directional/north,
/obj/machinery/light/directional/east,
/obj/structure/table/glass,
/obj/item/folder/white,
/obj/item/stamp/head/cmo,
/obj/item/clothing/neck/stethoscope,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"tGP" = (
/obj/machinery/conveyor{
id = "gulag"
@@ -65424,6 +65439,15 @@
dir = 1
},
/area/station/engineering/main)
"uSq" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
},
/obj/machinery/meter,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/freezerchamber)
"uTc" = (
/obj/machinery/chem_heater/withbuffer,
/obj/structure/window/reinforced/spawner/directional/north{
@@ -66249,6 +66273,15 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"vhr" = (
/mob/living/simple_animal/hostile/retaliate/goat{
atmos_requirements = list("min_oxy"=1,"max_oxy"=0,"min_plas"=0,"max_plas"=1,"min_co2"=0,"max_co2"=5,"min_n2"=0,"max_n2"=0);
desc = "Not known for their pleasant disposition. This one seems a bit more hardy to the cold.";
minbodytemp = 150;
name = "Snowy Pete"
},
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"vhB" = (
/obj/structure/chair/plastic,
/obj/effect/turf_decal/bot_red,
@@ -67693,16 +67726,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"vEA" = (
/obj/structure/table,
/obj/item/paper_bin/carbon{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen,
/obj/item/stamp/hop,
/turf/open/floor/iron,
/area/station/command/heads_quarters/hop)
"vEE" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -69316,6 +69339,16 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
"wgH" = (
/obj/structure/table,
/obj/item/folder/white,
/obj/item/pen,
/obj/item/stamp/head/rd{
pixel_x = 3;
pixel_y = -2
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
"wgI" = (
/obj/effect/turf_decal/trimline/green/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -69839,15 +69872,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"wox" = (
/obj/structure/table/reinforced,
/obj/effect/landmark/event_spawn,
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/paper/monitorkey,
/obj/item/stamp/ce,
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
"woF" = (
/obj/machinery/modular_computer/console/preset/cargochat/medical{
dir = 1
@@ -71242,15 +71266,6 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
"wKf" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
},
/obj/machinery/meter,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/freezerchamber)
"wKm" = (
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/structure/cable,
@@ -73089,15 +73104,6 @@
dir = 9
},
/area/station/science/research)
"xmj" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/obj/effect/turf_decal/box/red,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/burnchamber)
"xmx" = (
/obj/structure/sink/kitchen/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -76131,12 +76137,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"ykW" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/captain,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"ykZ" = (
/obj/effect/turf_decal/siding/wideplating/dark,
/obj/item/radio/intercom/directional/east,
@@ -179398,7 +179398,7 @@ dEB
dMS
jBB
pKe
fDu
rZK
qPE
fwB
fwB
@@ -179655,7 +179655,7 @@ dEB
dMS
jBB
mQk
lOs
vhr
wMP
fwB
fwB
@@ -191505,11 +191505,11 @@ nBV
iao
iPD
iao
xmj
odf
qSk
xtS
rhY
wKf
uSq
pjc
gmb
hac
@@ -228230,7 +228230,7 @@ tKI
ouZ
alT
taf
nWk
kGQ
bAa
xal
wLO
@@ -233896,7 +233896,7 @@ rpu
ybI
nnR
tuz
vEA
nFg
bhK
rAA
cpm
@@ -235889,7 +235889,7 @@ nbp
mgU
nlz
ioi
nBx
fad
azx
tDw
rhf
@@ -236000,7 +236000,7 @@ glc
fab
ktw
bny
eUQ
qDj
xBp
bYw
bYw
@@ -236445,7 +236445,7 @@ fiE
oBs
utR
tmQ
dgG
axf
kzD
kJP
lhv
@@ -237531,7 +237531,7 @@ mBB
bup
ojv
htc
wox
mDw
vTi
qKQ
aTj
@@ -237998,7 +237998,7 @@ oRk
mvc
mvc
rAW
ykW
kwz
ghJ
uEm
sqU
@@ -246013,7 +246013,7 @@ oAD
xKX
vep
pBI
aqR
sCm
gGo
uqH
qXk
@@ -248283,7 +248283,7 @@ vBG
wvW
lmM
vBG
ghI
tGO
oMR
hsC
vBG
@@ -252411,7 +252411,7 @@ jbU
iyP
dUe
ank
dez
wgH
fUM
vaQ
jbU
_maps/map_files/MetaStation/MetaStation.dmm
+5776 -5776
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/NorthStar/north_star.dmm
+2568 -2568
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/debug/runtimestation.dmm
+138 -138
View File
@@ -61,26 +61,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
"ar" = (
/obj/structure/closet/secure_closet/engineering_welding{
locked = 0
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/engineering/main)
"as" = (
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
"at" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -320,11 +300,6 @@
/obj/machinery/announcement_system,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
"bs" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/science)
"bt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -373,22 +348,6 @@
/obj/machinery/computer/rdconsole,
/turf/open/floor/iron,
/area/station/science)
"bG" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/table,
/obj/item/uplink/debug{
pixel_x = -4;
pixel_y = 4
},
/obj/item/uplink/nuclear/debug,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/command/bridge)
"bH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron,
@@ -439,13 +398,6 @@
/obj/machinery/door/poddoor,
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
"bP" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
"bQ" = (
/obj/machinery/chem_master,
/turf/open/floor/iron/dark,
@@ -468,19 +420,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
"bU" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/mob/living/carbon/human,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/white/corner{
dir = 1
},
/area/station/medical/medbay)
"bV" = (
/obj/machinery/light/directional/north,
/mob/living/carbon/human,
@@ -764,14 +703,6 @@
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"cW" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/construction)
"cX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -804,23 +735,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"dd" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"de" = (
/obj/machinery/gulag_teleporter,
/turf/open/floor/iron,
/area/station/security/brig)
"dg" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/security/brig)
"dh" = (
/turf/closed/wall,
/area/station/hallway/secondary/entry)
@@ -1202,11 +1120,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eG" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/cargo/storage)
"eH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -1230,11 +1143,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eM" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"eN" = (
/obj/machinery/conveyor{
dir = 9;
@@ -1687,14 +1595,6 @@
},
/turf/open/floor/plating,
/area/station/commons/storage/primary)
"gi" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/machinery/computer/shuttle/mining,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"gk" = (
/obj/structure/sign/departments/evac,
/turf/closed/wall/r_wall,
@@ -1836,6 +1736,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science)
"hm" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/plating,
/area/station/engineering/atmos)
"hD" = (
/obj/structure/closet/secure_closet/chemical/heisenberg{
locked = 0
@@ -1940,11 +1845,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"ou" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/plating,
/area/station/engineering/atmos)
"oV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -1971,6 +1871,11 @@
/obj/machinery/door/airlock,
/turf/open/floor/plating,
/area/station/engineering/atmos)
"qx" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/cargo/storage)
"qQ" = (
/turf/open/floor/engine,
/area/station/cargo/miningoffice)
@@ -2100,14 +2005,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"wS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"wU" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
@@ -2134,11 +2031,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"AE" = (
"zS" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/science/explab)
/turf/open/floor/iron,
/area/station/science)
"AP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
@@ -2220,6 +2117,14 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
"EM" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/machinery/computer/shuttle/mining,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"ES" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -2234,6 +2139,27 @@
},
/turf/open/floor/iron,
/area/station/medical/chemistry)
"Fd" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/table,
/obj/item/uplink/debug{
pixel_x = -4;
pixel_y = 4
},
/obj/item/uplink/nuclear/debug,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/command/bridge)
"HW" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"If" = (
/obj/machinery/rnd/production/techfab/department,
/turf/open/floor/iron,
@@ -2253,6 +2179,14 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
"IH" = (
/obj/structure/closet/secure_closet/engineering_welding{
locked = 0
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/engineering/main)
"II" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2270,6 +2204,14 @@
},
/turf/open/floor/iron,
/area/station/medical/chemistry)
"JS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"Kx" = (
/obj/structure/table,
/obj/item/analyzer,
@@ -2329,6 +2271,19 @@
/obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/iron,
/area/station/science)
"Ot" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/mob/living/carbon/human,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/white/corner{
dir = 1
},
/area/station/medical/medbay)
"Ov" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -2341,6 +2296,23 @@
/obj/item/disk/tech_disk/debug,
/turf/open/floor/iron,
/area/station/science)
"Pk" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/science/explab)
"Px" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
"PJ" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/security/brig)
"Qi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -2378,6 +2350,14 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
"Sg" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/construction)
"Sj" = (
/obj/structure/table/optable,
/obj/effect/turf_decal/tile/blue{
@@ -2385,11 +2365,6 @@
},
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
"Sp" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"Td" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/stripes/line{
@@ -2416,6 +2391,18 @@
/obj/item/healthanalyzer/advanced,
/turf/open/floor/iron,
/area/station/medical/medbay)
"Va" = (
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
"Vg" = (
/obj/machinery/light/directional/south,
/obj/structure/cable,
@@ -2544,6 +2531,19 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"Zd" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"Zz" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"ZD" = (
/obj/machinery/suit_storage_unit/ce,
/turf/open/floor/iron,
@@ -4228,7 +4228,7 @@ em
em
em
em
gi
EM
gm
go
gp
@@ -5699,7 +5699,7 @@ aD
aD
bT
cI
dg
PJ
aD
aD
aD
@@ -5713,7 +5713,7 @@ eh
eh
eh
eF
eM
HW
fM
eh
eh
@@ -5880,12 +5880,12 @@ aa
ah
ut
aw
ou
hm
aw
aw
Kx
ah
bs
zS
bB
ca
If
@@ -5894,7 +5894,7 @@ kn
ES
bE
cN
cW
Sg
dm
dy
ii
@@ -6091,7 +6091,7 @@ dn
dn
dL
cN
AE
Pk
kp
XN
Ym
@@ -6258,7 +6258,7 @@ bD
XC
co
bA
wS
JS
bE
bE
cN
@@ -6438,7 +6438,7 @@ ab
ab
ab
bu
bG
Fd
ce
cp
bu
@@ -7090,7 +7090,7 @@ cE
bE
bE
cS
dd
Zz
dp
dl
dl
@@ -7350,7 +7350,7 @@ aa
aa
aa
aj
ar
IH
aA
aH
aF
@@ -7358,7 +7358,7 @@ lg
bf
bp
aj
bP
Px
Ce
JF
mE
@@ -7536,7 +7536,7 @@ aa
ad
af
ak
as
Va
aG
aV
bg
@@ -7910,7 +7910,7 @@ MN
MN
av
by
bU
Ot
cl
cl
cl
@@ -8380,7 +8380,7 @@ es
by
eu
eu
eG
qx
eP
fY
eZ
@@ -8391,7 +8391,7 @@ eu
eu
eu
et
Sp
Zd
fO
fO
fO
_maps/map_files/generic/CentCom.dmm
+2 -2
View File
@@ -877,7 +877,7 @@
/obj/item/clipboard,
/obj/item/folder/blue,
/obj/item/melee/chainofcommand,
/obj/item/stamp/captain,
/obj/item/stamp/head/captain,
/obj/machinery/newscaster{
pixel_y = 32
},
@@ -3265,7 +3265,7 @@
"pi" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/stamp/qm,
/obj/item/stamp/head/qm,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
_maps/map_files/tramstation/tramstation.dmm
+194 -194
View File
@@ -8197,6 +8197,11 @@
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/tram/right)
"btg" = (
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/obj/machinery/airalarm/directional/south,
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"btw" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -8275,16 +8280,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"buM" = (
/obj/structure/chair/office{
dir = 1
},
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
"buQ" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/machinery/status_display/evac/directional/east,
@@ -8770,6 +8765,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bDf" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/stamp/head/ce,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"bDj" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 9
@@ -9600,14 +9604,6 @@
/obj/structure/lattice,
/turf/open/space/openspace,
/area/space/nearstation)
"bQf" = (
/obj/machinery/camera/emp_proof/directional/east{
c_tag = "Secure - Telecomms Server Room East"
},
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
"bQt" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -9877,23 +9873,6 @@
/obj/machinery/keycard_auth/directional/east,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
"bWc" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 8;
piping_layer = 2
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/camera/directional/south{
c_tag = "Science - Mixing Lab";
network = list("ss13","rd")
},
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/white,
/area/station/science/ordnance/burnchamber)
"bWi" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
@@ -10758,6 +10737,12 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/server)
"civ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"ciA" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock"
@@ -13114,6 +13099,13 @@
/obj/machinery/disposal/bin,
/turf/open/floor/iron,
/area/station/command/bridge)
"dbU" = (
/obj/structure/chair/office/light{
dir = 1
},
/obj/effect/landmark/start/research_director,
/turf/open/floor/glass/reinforced,
/area/station/command/heads_quarters/rd)
"dbV" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 5
@@ -13362,11 +13354,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
"dgy" = (
/obj/effect/mapping_helpers/airalarm/tlv_cold_room,
/obj/machinery/airalarm/directional/south,
/turf/open/misc/asteroid/snow/coldroom,
/area/station/service/kitchen/coldroom)
"dgA" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
@@ -21802,12 +21789,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/commons/lounge)
"gws" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/stamp/hos,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
"gwy" = (
/obj/structure/sign/warning/no_smoking{
pixel_x = -28
@@ -23017,6 +22998,13 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/hallway)
"gSF" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"gSQ" = (
/obj/machinery/door/airlock{
name = "Custodial Closet"
@@ -24508,14 +24496,6 @@
"hBf" = (
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
"hBg" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
/obj/item/pen,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/item/stamp/cmo,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"hBl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall/r_wall,
@@ -26408,17 +26388,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"int" = (
/obj/structure/table,
/obj/item/paper_bin/carbon{
pixel_x = -3;
pixel_y = 7
},
/obj/item/stamp/qm,
/obj/effect/landmark/event_spawn,
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/qm)
"inG" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -31282,18 +31251,6 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/iron,
/area/station/maintenance/port/central)
"kax" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 8
},
/obj/machinery/meter,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/white,
/area/station/science/ordnance/freezerchamber)
"kaD" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -35667,6 +35624,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"lBF" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 8
},
/obj/machinery/meter,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/white,
/area/station/science/ordnance/freezerchamber)
"lBP" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -36852,6 +36821,28 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
"lWv" = (
/obj/structure/table,
/obj/machinery/button/door{
id = "rdoffice";
name = "Privacy Shutter Control";
pixel_x = -7;
pixel_y = -2;
req_access = list("research")
},
/obj/item/folder/white{
pixel_x = 5
},
/obj/item/stamp/head/rd{
pixel_x = 6;
pixel_y = 2
},
/obj/item/pen/fountain{
pixel_x = -4;
pixel_y = 7
},
/turf/open/floor/glass/reinforced,
/area/station/command/heads_quarters/rd)
"lWy" = (
/obj/structure/table,
/obj/machinery/computer/security/telescreen/entertainment/directional/west,
@@ -39345,12 +39336,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
"mWe" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"mWj" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/donkpockets,
@@ -42377,12 +42362,26 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"nXK" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
/obj/item/pen,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/item/stamp/head/cmo,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"nXP" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
"nXQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"nYr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43943,6 +43942,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
"oDH" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/head/captain,
/obj/machinery/door/window{
base_state = "right";
icon_state = "right";
name = "Captain's Desk";
req_access = list("captain")
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"oEf" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing,
@@ -45584,6 +45595,23 @@
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/research)
"pmP" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/head/hop,
/obj/item/trapdoor_remote/preloaded{
pixel_x = -8
},
/obj/machinery/requests_console/directional/west{
announcementConsole = 1;
anon_tips_receiver = 1;
assistance_requestable = 1;
department = "Head of Personnel's Desk";
name = "Head of Personnel's Requests Console";
supplies_requestable = 1
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"pni" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 9
@@ -45934,6 +45962,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"ptu" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/stamp/head/hos,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hos)
"ptB" = (
/obj/machinery/crossing_signal/southwest{
inbound = 2;
@@ -45974,23 +46008,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/right)
"pub" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/hop,
/obj/item/trapdoor_remote/preloaded{
pixel_x = -8
},
/obj/machinery/requests_console/directional/west{
announcementConsole = 1;
anon_tips_receiver = 1;
assistance_requestable = 1;
department = "Head of Personnel's Desk";
name = "Head of Personnel's Requests Console";
supplies_requestable = 1
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"puf" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -48891,13 +48908,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
"qtK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"qtS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -50319,13 +50329,6 @@
"qUB" = (
/turf/closed/wall,
/area/station/hallway/secondary/exit)
"qUC" = (
/obj/structure/chair/office/light{
dir = 1
},
/obj/effect/landmark/start/research_director,
/turf/open/floor/glass/reinforced,
/area/station/command/heads_quarters/rd)
"qUF" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -50828,6 +50831,14 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/carpet,
/area/station/medical/psychology)
"rcG" = (
/obj/machinery/camera/emp_proof/directional/east{
c_tag = "Secure - Telecomms Server Room East"
},
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
"rcH" = (
/obj/effect/turf_decal/caution/stand_clear/white{
dir = 4
@@ -51367,18 +51378,6 @@
/obj/machinery/telecomms/broadcaster/preset_left,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
"rnc" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/captain,
/obj/machinery/door/window{
base_state = "right";
icon_state = "right";
name = "Captain's Desk";
req_access = list("captain")
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"rnd" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 1
@@ -52455,6 +52454,19 @@
/obj/structure/sign/clock/directional/east,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
"rJD" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/meter,
/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
dir = 1
},
/obj/effect/turf_decal/trimline/yellow/arrow_cw,
/obj/structure/cable/layer1,
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/engine_access,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"rJE" = (
/obj/machinery/door/airlock/medical/glass{
name = "Medical Freezer"
@@ -53566,15 +53578,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
"sgu" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/stamp/ce,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"sgA" = (
/obj/structure/table,
/obj/machinery/light/small/directional/west,
@@ -54758,28 +54761,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
"szO" = (
/obj/structure/table,
/obj/machinery/button/door{
id = "rdoffice";
name = "Privacy Shutter Control";
pixel_x = -7;
pixel_y = -2;
req_access = list("research")
},
/obj/item/folder/white{
pixel_x = 5
},
/obj/item/stamp/rd{
pixel_x = 6;
pixel_y = 2
},
/obj/item/pen/fountain{
pixel_x = -4;
pixel_y = 7
},
/turf/open/floor/glass/reinforced,
/area/station/command/heads_quarters/rd)
"szZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58668,12 +58649,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/service/bar)
"tSh" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"tSp" = (
/obj/structure/table/wood,
/obj/machinery/airalarm/directional/west,
@@ -61914,6 +61889,23 @@
/obj/item/pen,
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
"uXn" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 8;
piping_layer = 2
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/camera/directional/south{
c_tag = "Science - Mixing Lab";
network = list("ss13","rd")
},
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
/turf/open/floor/iron/white,
/area/station/science/ordnance/burnchamber)
"uXt" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/trimline/red/filled/line,
@@ -62602,6 +62594,17 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"vjr" = (
/obj/structure/table,
/obj/item/paper_bin/carbon{
pixel_x = -3;
pixel_y = 7
},
/obj/item/stamp/head/qm,
/obj/effect/landmark/event_spawn,
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/qm)
"vju" = (
/obj/structure/table,
/obj/item/plate,
@@ -63232,19 +63235,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
"vsK" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/meter,
/obj/effect/turf_decal/trimline/yellow/arrow_ccw{
dir = 1
},
/obj/effect/turf_decal/trimline/yellow/arrow_cw,
/obj/structure/cable/layer1,
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/engine_access,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"vsL" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/box/white{
@@ -70168,6 +70158,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/cargo/drone_bay)
"ydr" = (
/obj/structure/chair/office{
dir = 1
},
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
/obj/effect/landmark/start/roboticist,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
"ydu" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -98556,7 +98556,7 @@ dwR
ney
muK
pGS
bQf
rcG
rME
dnE
ney
@@ -101643,7 +101643,7 @@ pfG
qHs
bpZ
fuj
vsK
rJD
hDI
oMc
lEf
@@ -102092,7 +102092,7 @@ pVJ
nUP
fgH
aeo
dgy
btg
iRL
snQ
iRL
@@ -102663,7 +102663,7 @@ gKJ
wIg
rSj
vRv
sgu
bDf
joI
fkq
sHH
@@ -110384,7 +110384,7 @@ gjj
rCd
pts
gEs
tSh
nXQ
rnA
hBY
atX
@@ -120141,7 +120141,7 @@ dfz
vqa
uIk
uIk
kax
lBF
vjT
fjn
mBW
@@ -121683,7 +121683,7 @@ dfz
vqO
edP
edP
bWc
uXn
hBl
hBl
gkD
@@ -151457,7 +151457,7 @@ xSr
umf
qjW
kHX
pub
pmP
swc
wHT
omH
@@ -156038,7 +156038,7 @@ aaa
rmB
qjw
gJI
gws
ptu
qUY
auP
qxT
@@ -158129,7 +158129,7 @@ tth
rKP
kOr
fpR
rnc
oDH
aBt
kbM
qiN
@@ -166402,7 +166402,7 @@ qOY
iae
qeL
sYh
hBg
nXK
wdj
oGJ
oGJ
@@ -177947,7 +177947,7 @@ wSi
moz
gyP
cdB
mWe
civ
mAf
dzu
nto
@@ -178977,7 +178977,7 @@ gyP
aUb
eeE
wFx
qtK
gSF
tPD
uje
uje
@@ -179234,7 +179234,7 @@ gyP
ixu
eeE
muZ
qtK
gSF
bpa
uje
dLO
@@ -180231,7 +180231,7 @@ hSs
gbW
uUE
nms
int
vjr
pUV
gSi
byL
@@ -180259,7 +180259,7 @@ tFB
vnu
nUy
fhy
buM
ydr
goK
gal
pdZ
@@ -181814,7 +181814,7 @@ iij
yaB
tes
byp
qUC
dbU
tes
cjz
qKE
@@ -182070,7 +182070,7 @@ jwe
rBb
kxF
tes
szO
lWv
xPR
kye
cwX
_maps/multiz_debug.json
+2 -1
View File
@@ -4,7 +4,8 @@
"map_path": "map_files/debug",
"map_file": "multiz.dmm",
"ignored_unit_tests": [
"/datum/unit_test/job_roundstart_spawnpoints"
"/datum/unit_test/job_roundstart_spawnpoints",
"/datum/unit_test/required_map_items"
],
"traits": [
{
_maps/runtimestation.json
+2 -1
View File
@@ -5,7 +5,8 @@
"map_file": "runtimestation.dmm",
"space_ruin_levels": 1,
"ignored_unit_tests": [
"/datum/unit_test/job_roundstart_spawnpoints"
"/datum/unit_test/job_roundstart_spawnpoints",
"/datum/unit_test/required_map_items"
],
"shuttles": {
"cargo": "cargo_delta"
_maps/shuttles/emergency_tranquility.dmm
+1 -1
View File
@@ -882,7 +882,7 @@
/obj/item/stamp/denied{
pixel_x = 8
},
/obj/item/stamp/qm{
/obj/item/stamp/head/qm{
pixel_y = -5;
pixel_x = 8
},
code/__DEFINES/unit_tests.dm
+30
View File
@@ -18,3 +18,33 @@
#else
#define TEST_ONLY_ASSERT(test, explanation)
#endif
/**
* Used for registering typepaths of item to be tracked as a "required map item"
* This is used to ensure that that all station maps have certain items mapped in that they should have
* Or that people aren't mapping in an excess of items that they shouldn't be
* (For example, all map should only ever have 1 Pun Pun)
*
* Min is inclusive, Max is inclusive (so 1, 1 means min of 1, max of 1, or only 1 allowed)
*
* This should only be used in Initialize(). And don't forget to update the unit test with the type itself!
*/
#ifdef UNIT_TESTS
#define REGISTER_REQUIRED_MAP_ITEM(min, max) \
do { \
if(mapload) { \
var/turf/spawn_turf = get_turf(src); \
if(is_station_level(spawn_turf?.z || 0)) { \
var/datum/required_item/existing_value = GLOB.required_map_items[type]; \
if(isnull(existing_value)) { \
var/datum/required_item/new_value = new(type, min, max); \
GLOB.required_map_items[type] = new_value; \
} else { \
existing_value.total_amount += 1; \
}; \
}; \
}; \
} while (FALSE)
#else
#define REGISTER_REQUIRED_MAP_ITEM(min, max)
#endif
code/_globalvars/phobias.dm
+3 -15
View File
@@ -184,14 +184,8 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/encryptionkey/heads,
/obj/item/radio/headset/heads,
/obj/item/melee/baton/telescopic,
/obj/item/stamp/captain,
/obj/item/stamp/ce,
/obj/item/stamp/centcom,
/obj/item/stamp/cmo,
/obj/item/stamp/hop,
/obj/item/stamp/hos,
/obj/item/stamp/rd,
/obj/item/stamp/qm,
/obj/item/stamp/head,
/obj/item/toy/figure/captain,
/obj/item/toy/figure/ce,
/obj/item/toy/figure/cmo,
@@ -293,14 +287,8 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/radio/headset/heads,
/obj/item/megaphone/command,
/obj/item/melee/baton/abductor,
/obj/item/stamp/captain,
/obj/item/stamp/ce,
/obj/item/stamp/centcom,
/obj/item/stamp/cmo,
/obj/item/stamp/hop,
/obj/item/stamp/hos,
/obj/item/stamp/rd,
/obj/item/stamp/qm,
/obj/item/stamp/head,
/obj/item/storage/belt/military/abductor,
/obj/item/toy/figure/captain,
/obj/item/toy/figure/ce,
@@ -402,7 +390,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/megaphone/sec,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/stamp/hos,
/obj/item/stamp/head/hos,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/secofficer,
/obj/machinery/door/airlock/security,
code/datums/components/crafting/misc.dm
+1 -1
View File
@@ -32,5 +32,5 @@
/obj/item/paper/paperslip = 1,
/obj/item/stack/sheet/plastic = 3,
)
tool_paths = list(/obj/item/stamp/captain)
tool_paths = list(/obj/item/stamp/head/captain)
category = CAT_MISC
code/game/machinery/computer/communications.dm
+3
View File
@@ -87,6 +87,9 @@
/obj/machinery/computer/communications/Initialize(mapload)
. = ..()
// All maps should have at least 1 comms console
REGISTER_REQUIRED_MAP_ITEM(1, INFINITY)
GLOB.shuttle_caller_list += src
AddComponent(/datum/component/gps, "Secured Communications Signal")
code/modules/cargo/department_order.dm
+3
View File
@@ -24,6 +24,9 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list(
/obj/machinery/computer/department_orders/Initialize(mapload, obj/item/circuitboard/board)
. = ..()
// All maps should have ONLY ONE of each order console roundstart
REGISTER_REQUIRED_MAP_ITEM(1, 1)
if(mapload) //check for mapping errors
for(var/delivery_area_type in department_delivery_areas)
if(GLOB.areas_by_type[delivery_area_type])
code/modules/jobs/job_types/captain.dm
+1 -1
View File
@@ -79,7 +79,7 @@
accessory = /obj/item/clothing/accessory/medal/gold/captain
chameleon_extras = list(
/obj/item/gun/energy/e_gun,
/obj/item/stamp/captain,
/obj/item/stamp/head/captain,
)
implants = list(/obj/item/implant/mindshield)
skillchips = list(/obj/item/skillchip/disk_verifier)
code/modules/jobs/job_types/chief_engineer.dm
+1 -1
View File
@@ -74,7 +74,7 @@
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
box = /obj/item/storage/box/survival/engineer
chameleon_extras = /obj/item/stamp/ce
chameleon_extras = /obj/item/stamp/head/ce
skillchips = list(/obj/item/skillchip/job/engineer)
pda_slot = ITEM_SLOT_LPOCKET
code/modules/jobs/job_types/chief_medical_officer.dm
+1 -1
View File
@@ -76,7 +76,7 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = list(
/obj/item/gun/syringe,
/obj/item/stamp/cmo,
/obj/item/stamp/head/cmo,
)
skillchips = list(/obj/item/skillchip/entrails_reader)
code/modules/jobs/job_types/head_of_personnel.dm
+1 -1
View File
@@ -66,7 +66,7 @@
chameleon_extras = list(
/obj/item/gun/energy/e_gun,
/obj/item/stamp/hop,
/obj/item/stamp/head/hop,
)
/datum/outfit/job/hop/pre_equip(mob/living/carbon/human/H)
code/modules/jobs/job_types/head_of_security.dm
+1 -1
View File
@@ -71,7 +71,7 @@
box = /obj/item/storage/box/survival/security
chameleon_extras = list(
/obj/item/gun/energy/e_gun/hos,
/obj/item/stamp/hos,
/obj/item/stamp/head/hos,
)
implants = list(/obj/item/implant/mindshield)
code/modules/jobs/job_types/quartermaster.dm
+1 -1
View File
@@ -51,4 +51,4 @@
shoes = /obj/item/clothing/shoes/sneakers/brown
l_hand = /obj/item/clipboard
chameleon_extras = /obj/item/stamp/qm
chameleon_extras = /obj/item/stamp/head/qm
code/modules/jobs/job_types/research_director.dm
+1 -1
View File
@@ -73,7 +73,7 @@
satchel = /obj/item/storage/backpack/satchel/science
duffelbag = /obj/item/storage/backpack/duffelbag/science
chameleon_extras = /obj/item/stamp/rd
chameleon_extras = /obj/item/stamp/head/rd
skillchips = list(/obj/item/skillchip/job/research_director)
/datum/outfit/job/rd/mod
code/modules/mob/living/basic/pets/dog.dm
+3
View File
@@ -541,6 +541,9 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
/mob/living/basic/pet/dog/corgi/ian/Initialize(mapload)
. = ..()
// Ensure Ian exists
REGISTER_REQUIRED_MAP_ITEM(1, 1)
//parent call must happen first to ensure IAN
//is not in nullspace when child puppies spawn
Read_Memory()
code/modules/mob/living/carbon/human/monkey/monkey.dm
+2
View File
@@ -65,6 +65,8 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu
if(!GLOB.the_one_and_only_punpun && mapload)
GLOB.the_one_and_only_punpun = src
// 1 Pun Pun should exist
REGISTER_REQUIRED_MAP_ITEM(1, 1)
fully_replace_character_name(real_name, name_to_use)
code/modules/mob/living/simple_animal/parrot.dm
+3
View File
@@ -924,6 +924,9 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
. = ..()
// Ensure 1 Poly exists
REGISTER_REQUIRED_MAP_ITEM(1, 1)
/mob/living/simple_animal/parrot/poly/Life(seconds_per_tick = SSMOBS_DT, times_fired)
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory(FALSE)
code/modules/paperwork/paperwork.dm
+7 -7
View File
@@ -113,7 +113,7 @@
//HEAD OF STAFF DOCUMENTS
/obj/item/paperwork/cargo
stamp_requested = /obj/item/stamp/qm
stamp_requested = /obj/item/stamp/head/qm
stamp_job = /datum/job/quartermaster
stamp_icon = "paper_stamp-qm"
@@ -126,7 +126,7 @@
detailed_desc += span_info(" Despite how disorganized the documents are, they're all appropriately filled in. You should probably stamp this.")
/obj/item/paperwork/security
stamp_requested = /obj/item/stamp/hos
stamp_requested = /obj/item/stamp/head/hos
stamp_job = /datum/job/head_of_security
stamp_icon = "paper_stamp-hos"
@@ -139,7 +139,7 @@
detailed_desc += span_info(" What a bunch of crap, the security team were clearly just doing what they had to. You should probably stamp this.")
/obj/item/paperwork/service
stamp_requested = /obj/item/stamp/hop
stamp_requested = /obj/item/stamp/head/hop
stamp_job = /datum/job/head_of_personnel
stamp_icon = "paper_stamp-hop"
@@ -152,7 +152,7 @@
detailed_desc += span_info(" A MAXIMUM priority request like this is nothing to balk at. You should probably stamp this.")
/obj/item/paperwork/medical
stamp_requested = /obj/item/stamp/cmo
stamp_requested = /obj/item/stamp/head/cmo
stamp_job = /datum/job/chief_medical_officer
stamp_icon = "paper_stamp-cmo"
@@ -166,7 +166,7 @@
/obj/item/paperwork/engineering
stamp_requested = /obj/item/stamp/ce
stamp_requested = /obj/item/stamp/head/ce
stamp_job = /datum/job/chief_engineer
stamp_icon = "paper_stamp-ce"
@@ -179,7 +179,7 @@
detailed_desc += span_info(" Damn, that's impressive stuff. You should probably stamp this.")
/obj/item/paperwork/research
stamp_requested = /obj/item/stamp/rd
stamp_requested = /obj/item/stamp/head/rd
stamp_job = /datum/job/research_director
stamp_icon = "paper_stamp-rd"
@@ -192,7 +192,7 @@
detailed_desc += span_info(" Regardless, they're still perfectly usable test results. You should probably stamp this.")
/obj/item/paperwork/captain
stamp_requested = /obj/item/stamp/captain
stamp_requested = /obj/item/stamp/head/captain
stamp_job = /datum/job/captain
stamp_icon = "paper_stamp-cap"
code/modules/paperwork/stamps.dm
+18 -11
View File
@@ -26,46 +26,53 @@
stamp_class = sheet.icon_class_name(icon_state)
)
/obj/item/stamp/qm
name = "quartermaster's rubber stamp"
icon_state = "stamp-qm"
dye_color = DYE_QM
/obj/item/stamp/law
name = "law office's rubber stamp"
icon_state = "stamp-law"
dye_color = DYE_LAW
/obj/item/stamp/captain
/obj/item/stamp/head
/obj/item/stamp/head/Initialize(mapload)
. = ..()
// All maps should have at least 1 of each head of staff stamp
REGISTER_REQUIRED_MAP_ITEM(1, INFINITY)
/obj/item/stamp/head/captain
name = "captain's rubber stamp"
icon_state = "stamp-cap"
dye_color = DYE_CAPTAIN
/obj/item/stamp/hop
/obj/item/stamp/head/hop
name = "head of personnel's rubber stamp"
icon_state = "stamp-hop"
dye_color = DYE_HOP
/obj/item/stamp/hos
/obj/item/stamp/head/hos
name = "head of security's rubber stamp"
icon_state = "stamp-hos"
dye_color = DYE_HOS
/obj/item/stamp/ce
/obj/item/stamp/head/ce
name = "chief engineer's rubber stamp"
icon_state = "stamp-ce"
dye_color = DYE_CE
/obj/item/stamp/rd
/obj/item/stamp/head/rd
name = "research director's rubber stamp"
icon_state = "stamp-rd"
dye_color = DYE_RD
/obj/item/stamp/cmo
/obj/item/stamp/head/cmo
name = "chief medical officer's rubber stamp"
icon_state = "stamp-cmo"
dye_color = DYE_CMO
/obj/item/stamp/head/qm
name = "quartermaster's rubber stamp"
icon_state = "stamp-qm"
dye_color = DYE_QM
/obj/item/stamp/denied
name = "\improper DENIED rubber stamp"
icon_state = "stamp-deny"
code/modules/unit_tests/_unit_tests.dm
+1
View File
@@ -189,6 +189,7 @@
#include "reagent_names.dm"
#include "reagent_recipe_collisions.dm"
#include "reagent_transfer.dm"
#include "required_map_items.dm"
#include "resist.dm"
#include "say.dm"
#include "screenshot_antag_icons.dm"
code/modules/unit_tests/required_map_items.dm
+62
View File
@@ -0,0 +1,62 @@
/**
* Tests that all expected items are mapped in roundstart.
*
* How to add an item to this test:
* - Add the typepath(s) to setup_expected_types
* - In the type's initialize, REGISTER_REQUIRED_MAP_ITEM() a minimum and maximum
*/
/datum/unit_test/required_map_items
/// A list of all typepaths that we expect to be in the required items list
var/list/expected_types = list()
/// Used to fill the expected types list with all the types we look for on the map.
/// This list will just be full of typepaths that we expect.
/// More detailed information about each item (mainly, how much of each should exist) is set on a per item basis
/datum/unit_test/required_map_items/proc/setup_expected_types()
expected_types += subtypesof(/obj/item/stamp/head)
expected_types += subtypesof(/obj/machinery/computer/department_orders)
expected_types += /obj/machinery/computer/communications
expected_types += /mob/living/carbon/human/species/monkey/punpun
expected_types += /mob/living/basic/pet/dog/corgi/ian
expected_types += /mob/living/simple_animal/parrot/poly
/datum/unit_test/required_map_items/Run()
setup_expected_types()
var/list/required_map_items = GLOB.required_map_items.Copy()
for(var/got_type in expected_types)
var/datum/required_item/item = required_map_items[got_type]
var/items_found = item?.total_amount || 0
required_map_items -= got_type
if(items_found <= 0)
TEST_FAIL("Item [got_type] was not found, but is expected to be mapped in on mapload!")
continue
if(items_found < item.minimum_amount)
TEST_FAIL("Item [got_type] should have at least [item.minimum_amount] mapped in but only had [items_found] on mapload!")
continue
if(items_found > item.maximum_amount)
TEST_FAIL("Item [got_type] should have at most [item.maximum_amount] mapped in but had [items_found] on mapload!")
continue
// This primarily serves as a reminder to include the typepath in the expected types list above.
// However we can easily delete this line in the future if it runs into false positives.
TEST_ASSERT(length(required_map_items) == 0, "The following paths were found in required map items, but weren't checked: [english_list(required_map_items)]")
/// Datum for tracking required map items
/datum/required_item
/// Type (exact) being tracked
var/tracked_type
/// How many exist in the world
var/total_amount = 0
/// Min. amount of this type that should exist roundstart (inclusive)
var/minimum_amount = 1
/// Max. amount of this type that should exist roundstart (inclusive)
var/maximum_amount = 1
/datum/required_item/New(tracked_type, minimum_amount = 1, maximum_amount = 1)
src.tracked_type = tracked_type
src.minimum_amount = minimum_amount
src.maximum_amount = maximum_amount
total_amount += 1
code/modules/unit_tests/unit_test.dm
+2
View File
@@ -15,6 +15,8 @@ GLOBAL_DATUM(current_test, /datum/unit_test)
GLOBAL_VAR_INIT(failed_any_test, FALSE)
/// When unit testing, all logs sent to log_mapping are stored here and retrieved in log_mapping unit test.
GLOBAL_LIST_EMPTY(unit_test_mapping_logs)
/// Global assoc list of required mapping items, [item typepath] to [required item datum].
GLOBAL_LIST_EMPTY(required_map_items)
/// A list of every test that is currently focused.
/// Use the PERFORM_ALL_TESTS macro instead.
tools/UpdatePaths/Scripts/74985_stamps.txt
+7
View File
@@ -0,0 +1,7 @@
/obj/item/stamp/captain : /obj/item/stamp/head/captain {@OLD}
/obj/item/stamp/ce : /obj/item/stamp/head/ce {@OLD}
/obj/item/stamp/cmo : /obj/item/stamp/head/cmo {@OLD}
/obj/item/stamp/hop : /obj/item/stamp/head/hop {@OLD}
/obj/item/stamp/hos : /obj/item/stamp/head/hos {@OLD}
/obj/item/stamp/qm : /obj/item/stamp/head/qm {@OLD}
/obj/item/stamp/rd : /obj/item/stamp/head/rd {@OLD}