Merge remote-tracking branch 'citadel/master' into eldritch_affairs

This commit is contained in:
kevinz000
2020-03-29 20:44:49 -07:00
110 changed files with 2217 additions and 1979 deletions
@@ -1,4 +1,35 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ab" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ac" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ad" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plating,
/area/engine/engineering)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/button/door{
@@ -166,13 +197,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"wt" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"xx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -320,16 +344,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"HW" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"In" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -366,13 +380,6 @@
/obj/machinery/power/am_control_unit,
/turf/open/floor/plating,
/area/engine/engineering)
"JC" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"JZ" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -525,16 +532,6 @@
/obj/effect/turf_decal/box/red,
/turf/open/floor/engine,
/area/engine/engineering)
"YY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Zb" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -862,7 +859,7 @@ xJ
gf
fh
dN
YY
aa
MD
Ch
dz
@@ -890,7 +887,7 @@ LO
Eu
Pg
cP
JC
ab
WI
rj
dz
@@ -918,7 +915,7 @@ NS
xx
fh
zW
JC
ab
WI
rj
dz
@@ -946,7 +943,7 @@ yo
me
aT
Aw
JC
ab
WI
rj
dz
@@ -973,7 +970,7 @@ MJ
jH
FK
Ch
wt
ad
Ch
rj
rj
@@ -1026,7 +1023,7 @@ MJ
MJ
"}
(17,1,1) = {"
wt
ad
Zz
Wf
Ox
@@ -1082,7 +1079,7 @@ MJ
MJ
"}
(19,1,1) = {"
wt
ad
eJ
Zx
nW
@@ -1141,7 +1138,7 @@ MJ
jH
Nz
Ch
wt
ad
Ch
rj
rj
@@ -1170,7 +1167,7 @@ fh
WX
HQ
Aw
JC
ab
WI
rj
dz
@@ -1198,7 +1195,7 @@ fh
kh
fh
fh
JC
ab
WI
rj
dz
@@ -1226,7 +1223,7 @@ fh
kh
uG
cP
JC
ab
WI
rj
dz
@@ -1254,7 +1251,7 @@ eA
FY
mB
Rp
HW
ac
Mi
Ch
dz
@@ -1,4 +1,52 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ab" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ac" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ad" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ae" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen,
/turf/open/floor/plasteel,
/area/engine/engineering)
"af" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/button/door{
@@ -35,16 +83,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"dW" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ea" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
@@ -299,23 +337,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"wt" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"xg" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"xx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -542,16 +563,6 @@
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
/area/engine/engineering)
"HW" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"In" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -582,19 +593,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"JC" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Kg" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -825,19 +823,6 @@
},
/turf/closed/wall,
/area/engine/engineering)
"YY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Zb" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -1169,7 +1154,7 @@ xJ
gf
fh
dN
YY
aa
MD
Ch
Pt
@@ -1197,7 +1182,7 @@ LO
Eu
Pg
cP
JC
ab
tv
rj
Pt
@@ -1225,7 +1210,7 @@ NS
xx
fh
zW
dW
ac
ea
rj
Pt
@@ -1253,7 +1238,7 @@ yo
me
aT
Aw
JC
ab
tv
rj
Og
@@ -1280,7 +1265,7 @@ MJ
jH
FK
Ch
wt
af
tE
rj
rj
@@ -1333,7 +1318,7 @@ dz
MJ
"}
(17,1,1) = {"
wt
af
Zz
Wf
Ox
@@ -1389,7 +1374,7 @@ MJ
MJ
"}
(19,1,1) = {"
wt
af
eJ
Zx
nW
@@ -1448,7 +1433,7 @@ MJ
jH
Nz
Ch
wt
af
tE
rj
rj
@@ -1477,7 +1462,7 @@ AF
WX
HQ
Aw
JC
ab
tv
rj
Og
@@ -1505,7 +1490,7 @@ fh
kh
fh
fh
dW
ac
ea
rj
Pt
@@ -1533,7 +1518,7 @@ fh
kh
uG
cP
xg
ad
tv
rj
Pt
@@ -1561,7 +1546,7 @@ eA
FY
mB
Rp
HW
ae
Mi
Ch
Pt
@@ -1,4 +1,18 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ab" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13,6 +27,76 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ad" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ae" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"af" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ag" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ah" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"at" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/stripes/line{
@@ -178,21 +262,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"df" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"dl" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -600,21 +669,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"nW" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/turf/open/floor/plating,
/area/engine/supermatter)
"ou" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -636,20 +690,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"px" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"pA" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -737,19 +777,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/engine/supermatter)
"re" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"rt" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
@@ -1091,19 +1118,6 @@
/obj/machinery/meter,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"Cn" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"CH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -1571,20 +1585,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"Nw" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"Nx" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2385,9 +2385,9 @@ VP
EX
Vg
KX
px
nW
Cn
aa
ae
ag
fj
xB
WI
@@ -2609,9 +2609,9 @@ Ws
Pa
wz
fj
Nw
df
re
ad
af
ah
KX
ni
lw
@@ -1,4 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"ab" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1805,13 +1812,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"Vz" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"VP" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -2320,7 +2320,7 @@ Vg
KX
px
nW
Vz
aa
cN
xB
WI
@@ -2348,7 +2348,7 @@ lQ
KX
RA
tE
Vz
aa
cN
Xy
Ml
@@ -2376,7 +2376,7 @@ uz
RA
ti
YY
Vz
aa
cN
JK
WT
@@ -2488,7 +2488,7 @@ RA
Wf
mW
bq
Vz
aa
cN
JK
WT
@@ -2516,7 +2516,7 @@ wz
fj
RA
cY
Vz
aa
cN
vO
Np
@@ -2544,7 +2544,7 @@ Ey
fj
Cn
df
Vz
aa
cN
JK
lw
@@ -1,4 +1,18 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ab" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13,6 +27,76 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ad" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ae" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"af" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ag" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ah" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"at" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/stripes/line{
@@ -178,21 +262,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"df" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"dl" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -591,21 +660,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"nW" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/turf/open/floor/plating,
/area/engine/supermatter)
"ou" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -627,20 +681,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"px" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"pA" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -728,19 +768,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/engine/supermatter)
"re" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"rt" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
@@ -1065,19 +1092,6 @@
/obj/machinery/meter,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"Cn" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"CH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -1546,20 +1560,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"Nw" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"Nx" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2335,9 +2335,9 @@ VP
EX
Vg
KX
px
nW
Cn
aa
ae
ag
fj
xB
WI
@@ -2559,9 +2559,9 @@ Ws
Pa
wz
fj
Nw
df
re
ad
af
ah
KX
ni
lw
@@ -1,4 +1,18 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ab" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13,6 +27,76 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ad" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ae" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"af" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ag" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ah" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"at" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/stripes/line{
@@ -190,21 +274,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"df" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"dl" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -619,21 +688,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"nW" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/turf/open/floor/plating,
/area/engine/supermatter)
"ou" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -655,20 +709,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"px" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"pA" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -770,19 +810,6 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"re" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"rt" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -1127,19 +1154,6 @@
/obj/machinery/meter,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"Cn" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"CH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -1605,20 +1619,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"Nw" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"Nx" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -2384,11 +2384,11 @@ bW
VP
rt
Vg
px
px
nW
Cn
Cn
aa
aa
ae
ag
ag
xB
WI
IE
@@ -2608,12 +2608,12 @@ hy
js
Pa
xB
Nw
Nw
df
re
re
Vg
ad
ad
af
ah
ah
vO
lw
bH
JV
@@ -1,4 +1,67 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"ab" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ac" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ad" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"ae" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"af" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/button/door{
@@ -348,23 +411,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"wt" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"xg" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"xx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -478,19 +524,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"Bh" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Bj" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -605,16 +638,6 @@
/obj/item/clothing/gloves/color/yellow,
/turf/open/floor/plasteel,
/area/engine/engineering)
"HW" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"In" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -645,16 +668,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"JC" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"JZ" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -968,19 +981,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"YY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Zb" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -1318,7 +1318,7 @@ xJ
gf
fh
dN
YY
ab
MD
Ch
Pt
@@ -1346,7 +1346,7 @@ LO
Eu
Pg
cP
Bh
ac
tv
rj
Pt
@@ -1374,7 +1374,7 @@ NS
xx
fh
zW
Bh
ac
tv
rj
Pt
@@ -1402,7 +1402,7 @@ yo
me
aT
Aw
JC
ad
WI
rj
Og
@@ -1429,7 +1429,7 @@ MJ
jH
FK
Ch
wt
aa
tE
rj
rj
@@ -1482,7 +1482,7 @@ dz
MJ
"}
(17,1,1) = {"
wt
aa
Zz
Wf
Ox
@@ -1538,7 +1538,7 @@ MJ
MJ
"}
(19,1,1) = {"
wt
aa
eJ
Zx
nW
@@ -1597,7 +1597,7 @@ MJ
jH
Nz
Ch
wt
aa
tE
rj
rj
@@ -1626,7 +1626,7 @@ AF
WX
HQ
Aw
JC
ad
WI
rj
Og
@@ -1654,7 +1654,7 @@ fh
kh
fh
fh
Bh
ac
tv
rj
Pt
@@ -1682,7 +1682,7 @@ fh
kh
uG
cP
xg
ae
tv
rj
Pt
@@ -1710,7 +1710,7 @@ eA
FY
mB
Rp
HW
af
Mi
Ch
Pt
+261 -237
View File
@@ -2512,9 +2512,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/airalarm{
pixel_y = 23
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"afa" = (
@@ -3231,11 +3228,10 @@
/turf/open/floor/plasteel,
/area/security/brig)
"agq" = (
/obj/machinery/door/poddoor/shutters{
id = "armory1";
name = "Armoury Shutter"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/shutters/window{
id = "armory1"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agr" = (
@@ -3586,25 +3582,58 @@
pixel_y = -26;
req_access_txt = "3"
},
/obj/machinery/door/poddoor/shutters{
id = "armory1";
name = "Armoury Shutter"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/shutters/window{
id = "armory1"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agW" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/item/storage/box/handcuffs{
pixel_x = -1;
pixel_y = 1
},
/obj/item/storage/box/handcuffs{
pixel_x = 1;
pixel_y = -1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/machinery/camera/motion{
c_tag = "Armory Motion Sensor";
dir = 4
},
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agX" = (
/obj/machinery/door/poddoor/shutters{
id = "armory2";
name = "Armoury Shutter"
},
/obj/machinery/button/door{
id = "armory2";
name = "Armory Shutters";
pixel_y = -26;
req_access_txt = "3"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/shutters/window{
id = "armory2"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agY" = (
@@ -3757,42 +3786,11 @@
/turf/open/floor/plasteel,
/area/security/main)
"ahm" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/item/storage/box/handcuffs{
pixel_x = -1;
pixel_y = 1
},
/obj/item/storage/box/handcuffs{
pixel_x = 1;
pixel_y = -1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/machinery/camera/motion{
c_tag = "Armory Motion Sensor";
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ahn" = (
/turf/closed/wall,
/area/maintenance/fore/secondary)
@@ -3824,6 +3822,17 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
"ahs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/landmark/start/assistant,
/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aht" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -3971,6 +3980,17 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"ahC" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ahD" = (
/obj/structure/chair,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -4100,6 +4120,30 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"ahO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4;
pixel_y = 5
},
/obj/structure/chair/sofa/left{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ahP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/dress/skirt/purple,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/obj/structure/sign/poster/official/fashion{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ahQ" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -4275,6 +4319,14 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/showroomfloor,
/area/security/brig)
"aia" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/secure_closet/hydroponics,
/obj/structure/sign/poster/official/hydro_ad{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/hydroponics)
"aib" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -4353,11 +4405,16 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aih" = (
/obj/machinery/door/poddoor/shutters{
/obj/machinery/button/door{
id = "armory2";
name = "Armoury Shutter"
name = "Armory Shutters";
pixel_y = -26;
req_access_txt = "3"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/shutters/window{
id = "armory2"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aii" = (
@@ -4614,6 +4671,16 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aiB" = (
/obj/machinery/vending/kink,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/sign/poster/official/fashion{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aiC" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -4722,6 +4789,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aiJ" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/sign/poster/official/hydro_ad{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/hydroponics)
"aiK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -4774,6 +4848,14 @@
/obj/effect/turf_decal/box,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aiP" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = -32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"aiQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -4797,6 +4879,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/processing)
"aiV" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aiW" = (
/obj/structure/closet/bombcloset/security,
/obj/effect/turf_decal/bot,
@@ -4817,26 +4906,24 @@
/turf/open/floor/plating,
/area/ai_monitored/security/armory)
"aja" = (
/obj/machinery/door/poddoor/shutters{
id = "armory3";
name = "Armoury Shutter"
},
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/poddoor/shutters/window{
id = "armory3"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"ajb" = (
/obj/machinery/door/poddoor/shutters{
id = "armory3";
name = "Armoury Shutter"
},
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/window{
id = "armory3"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"ajc" = (
@@ -4888,6 +4975,16 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"ajh" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/structure/sign/poster/official/pda_ad800{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aji" = (
/obj/structure/chair{
name = "Judge"
@@ -4974,6 +5071,17 @@
},
/turf/open/floor/plating,
/area/security/vacantoffice/b)
"ajs" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/sign/poster/official/pda_ad600{
pixel_x = 32
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"ajt" = (
/obj/machinery/camera{
c_tag = "Vacant Office B";
@@ -5001,6 +5109,15 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"ajv" = (
/obj/machinery/computer/med_data{
dir = 3
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = -32
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"ajw" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -5056,6 +5173,12 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"ajB" = (
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = 32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"ajC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -5069,6 +5192,13 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
"ajD" = (
/obj/effect/spawner/lootdrop/keg,
/obj/structure/sign/poster/contraband/scum{
pixel_x = -32
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ajE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -5093,6 +5223,16 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
"ajG" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/structure/sign/poster/contraband/scum{
pixel_x = -32
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ajH" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -5155,6 +5295,20 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"ajM" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
},
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"ajN" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -5309,6 +5463,18 @@
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
"aka" = (
/obj/structure/closet/secure_closet/bar{
req_access_txt = "25"
},
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/gun/ballistic/revolver/doublebarrel,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"akb" = (
/obj/machinery/light{
dir = 8
@@ -5503,6 +5669,12 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/main)
"akt" = (
/obj/machinery/chem_master/condimaster{
name = "HoochMaster 2000"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aku" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -5903,7 +6075,7 @@
"alq" = (
/obj/machinery/door/airlock/security/glass{
name = "Evidence Storage";
req_access_txt = "1"
req_access_txt = "4"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -8917,20 +9089,6 @@
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"asZ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
},
/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ata" = (
/turf/open/floor/wood,
/area/lawoffice)
@@ -9204,17 +9362,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aua" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/costume/kilt,
/obj/item/clothing/under/dress/skirt/purple,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/beret,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aub" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -15263,16 +15410,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aJE" = (
/obj/structure/closet/secure_closet/bar{
req_access_txt = "25"
},
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/clothing/under/suit/waiter,
/obj/item/gun/ballistic/revolver/doublebarrel,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aJF" = (
/obj/machinery/newscaster{
pixel_x = 30
@@ -15667,11 +15804,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aKK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/secure_closet/hydroponics,
/turf/open/floor/plasteel,
/area/hydroponics)
"aKL" = (
/obj/machinery/airalarm{
pixel_y = 24
@@ -16630,15 +16762,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aND" = (
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
/obj/item/flashlight/lamp,
/obj/item/flashlight/lamp/green,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNE" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -17828,13 +17951,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQU" = (
/obj/machinery/vending/kink,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQV" = (
/obj/machinery/vending/autodrobe/all_access,
/obj/structure/disposalpipe/segment{
@@ -21137,19 +21253,6 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel,
/area/hydroponics)
"aYP" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
},
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
},
/obj/structure/sign/poster/contraband/lizard{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/hydroponics)
"aYQ" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/green{
@@ -24275,11 +24378,6 @@
/obj/structure/chair,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bhf" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bhg" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -27673,10 +27771,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boX" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boY" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27717,13 +27811,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"bpa" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bpb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27755,14 +27842,6 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
"bpf" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"bph" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -30936,12 +31015,6 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/sleeper)
"bwC" = (
/obj/machinery/computer/med_data{
dir = 3
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bwD" = (
/obj/machinery/sleeper{
dir = 8
@@ -44825,13 +44898,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/aft)
"ccY" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/condiment/sugar,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ccZ" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -55845,16 +55911,6 @@
},
/turf/open/space,
/area/solar/starboard/fore)
"jJg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4;
pixel_y = 5
},
/obj/structure/chair/sofa{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"jJF" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
@@ -56570,13 +56626,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"lXE" = (
/obj/structure/chair/sofa/right,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"lZl" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -56849,12 +56898,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"mOO" = (
/obj/structure/chair/sofa/left{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"mPk" = (
/obj/structure/bed,
/obj/machinery/button/door{
@@ -57716,14 +57759,6 @@
/obj/item/target/syndicate,
/turf/open/floor/plating,
/area/security/range)
"pFX" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
pixel_x = -3;
pixel_y = 5
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"pHl" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -60342,17 +60377,6 @@
"xxp" = (
/turf/open/floor/plating,
/area/security/range)
"xzd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/chair/sofa,
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"xzv" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -79828,7 +79852,7 @@ aLH
aLE
aOl
aPA
aQU
aiB
aQN
nLw
sLa
@@ -79867,7 +79891,7 @@ aaa
aaa
aaa
bCq
bJP
ajD
bCq
bSn
bCq
@@ -79880,7 +79904,7 @@ aaf
bCq
cAy
cAB
ccY
ajG
cAD
cAH
cfw
@@ -86014,7 +86038,7 @@ bjz
bkT
bjz
bjz
boX
aiV
bqv
bqv
bqv
@@ -86271,7 +86295,7 @@ bjB
bkW
bmp
bjz
bpa
ajh
bqy
cBr
bqy
@@ -87813,7 +87837,7 @@ bcd
bcd
bms
bnS
bpf
ajs
bqC
brZ
btE
@@ -89810,7 +89834,7 @@ aaZ
aeY
acn
agR
ahm
agW
ahA
aeE
agz
@@ -91097,8 +91121,8 @@ agq
agV
aaZ
aaZ
aih
agX
aih
aaZ
aaZ
aaZ
@@ -96031,7 +96055,7 @@ aYV
aYV
bet
bfH
bhf
aiP
wbE
bhh
wbE
@@ -96042,7 +96066,7 @@ bqP
bsy
bEe
bvh
bwC
ajv
bxN
bze
bAp
@@ -96514,8 +96538,8 @@ wig
str
rrM
clO
asZ
aua
ahC
ahP
oZl
awB
att
@@ -97283,9 +97307,9 @@ con
eVJ
dqb
qeA
lXE
pFX
mOO
ahm
fHG
fHG
fHG
fHG
pPi
@@ -97298,7 +97322,7 @@ sEi
alP
aGJ
aIe
aJE
aka
aLU
aKQ
aNu
@@ -97540,9 +97564,9 @@ fyS
eVJ
dqb
veS
xzd
ahs
sJI
jJg
ahO
fHG
eAJ
rvr
@@ -97815,7 +97839,7 @@ aHM
aJm
aKz
mjr
aND
akt
aJC
aab
aRg
@@ -99127,7 +99151,7 @@ bsx
bst
bfJ
bhh
bhh
ajB
bwK
bhh
bhh
@@ -100650,7 +100674,7 @@ aSR
aUi
aVJ
aOX
aYP
aiJ
bal
bam
aYV
@@ -101154,7 +101178,7 @@ wBd
aGC
aIl
aIq
aKK
aia
aMy
aIp
nGf
@@ -108931,7 +108955,7 @@ aaa
cNW
clt
cQw
bNB
ajM
cOe
cOe
cNW
+336 -279
View File
@@ -124,6 +124,33 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"aaq" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aar" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aas" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland1";
@@ -143,10 +170,265 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/starboard/fore)
"aav" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aaw" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aax" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aay" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaz" = (
/obj/effect/decal/cleanable/oil,
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaA" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaB" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aaC" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aaD" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engpa";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaE" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
"aaF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"aaG" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"aaH" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"aaI" = (
/obj/structure/dresser,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/sign/poster/contraband/scum{
pixel_x = 32
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/port/fore)
"aaJ" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/structure/sign/poster/official/nt_storm_officer{
pixel_y = -32
},
/turf/open/floor/plasteel,
/area/security/main)
"aaK" = (
/obj/machinery/flasher/portable,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/nt_storm{
pixel_y = 32
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aaL" = (
/obj/structure/rack,
/obj/item/gun/energy/ionrifle,
/obj/item/clothing/suit/armor/laserproof,
/obj/item/gun/energy/temperature/security,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/ion_rifle{
pixel_x = 32
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aaM" = (
/obj/machinery/vending/wardrobe/medi_wardrobe,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/medical/storage)
"aaN" = (
/obj/structure/bed/roller,
/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_y = 32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"aaO" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -154,6 +436,30 @@
"aaP" = (
/turf/closed/wall/mineral/plastitanium,
/area/hallway/secondary/entry)
"aaQ" = (
/obj/structure/sign/poster/official/medical_green_cross,
/turf/closed/wall,
/area/medical/medbay/central)
"aaR" = (
/obj/structure/table/wood,
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/scum{
pixel_x = 32
},
/obj/structure/sign/poster/contraband/scum{
pixel_x = 32
},
/obj/structure/sign/poster/contraband/scum{
pixel_x = 32
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"aaS" = (
/turf/closed/wall/mineral/plastitanium,
/area/construction/mining/aux_base)
@@ -9068,13 +9374,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"avk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"avl" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
@@ -10232,20 +10531,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"axv" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/engine/supermatter)
"axw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -10303,19 +10588,6 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"axD" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/supermatter)
"axE" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -10427,12 +10699,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/fore)
"axN" = (
/obj/structure/dresser,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/port/fore)
"axO" = (
/obj/structure/table/wood,
/obj/item/camera,
@@ -10979,20 +11245,6 @@
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"ayM" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ayN" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -11587,19 +11839,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"azS" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/engine/supermatter)
"azT" = (
/obj/machinery/power/rad_collector/anchored,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -16677,20 +16916,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/engine/atmospherics_engine)
"aID" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"aIE" = (
/obj/machinery/door/firedoor,
/obj/structure/cable/white{
@@ -16710,14 +16935,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"aIF" = (
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
"aIG" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/bot,
@@ -41291,14 +41508,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"bwj" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/plasteel,
/area/security/main)
"bwk" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -60266,23 +60475,6 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
"bXR" = (
/obj/structure/rack,
/obj/item/gun/energy/ionrifle,
/obj/item/clothing/suit/armor/laserproof,
/obj/item/gun/energy/temperature/security,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"bXS" = (
/obj/structure/window/reinforced{
dir = 8
@@ -66492,16 +66684,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/engine/engineering)
"chv" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"chw" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -67523,19 +67705,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"cjf" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"cjg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -68306,26 +68475,6 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
"ckA" = (
/obj/effect/decal/cleanable/oil,
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"ckB" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -69094,19 +69243,6 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
"clV" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"clW" = (
/obj/structure/rack,
/obj/item/crowbar,
@@ -70125,20 +70261,6 @@
/obj/machinery/status_display/evac,
/turf/closed/wall/r_wall,
/area/engine/engineering)
"cnE" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"cnF" = (
/obj/machinery/requests_console{
department = "Chapel Office";
@@ -71572,22 +71694,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"cqw" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"cqx" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -76839,25 +76945,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"czs" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engpa";
name = "Engineering Chamber Shutters"
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"czt" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -85482,14 +85569,6 @@
},
/turf/open/floor/plasteel,
/area/medical/storage)
"cNO" = (
/obj/machinery/vending/wardrobe/medi_wardrobe,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel,
/area/medical/storage)
"cNP" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -87271,17 +87350,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cRa" = (
/obj/structure/bed/roller,
/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cRb" = (
/obj/structure/bed/roller,
/obj/machinery/iv_drip,
@@ -103990,17 +104058,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
/area/crew_quarters/abandoned_gambling_den)
"duk" = (
/obj/structure/table/wood,
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/assembly/timer{
pixel_x = 3;
pixel_y = 3
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"dul" = (
/obj/structure/table,
/obj/item/stack/packageWrap,
@@ -151484,10 +151541,10 @@ car
cbV
cdJ
car
chv
cjf
ckA
clV
aax
aay
aaz
aaA
cnC
cpa
cqs
@@ -151495,10 +151552,10 @@ cqr
ctq
cuR
cnC
cjf
czs
clV
chv
aay
aaD
aaA
aax
car
cFO
cbV
@@ -152002,13 +152059,13 @@ chx
cjh
ckC
clX
cnE
aaB
cpc
cqu
cqr
cts
cuT
cnE
aaB
clX
czt
cAL
@@ -152040,7 +152097,7 @@ dof
dmi
dry
dta
duk
aaR
dvY
dod
dmi
@@ -152458,9 +152515,9 @@ asq
atO
auX
awf
axv
axv
azS
aaq
aaq
aaw
awi
aCk
aDn
@@ -152518,9 +152575,9 @@ cjn
clZ
cnF
car
cqw
aaC
car
cqw
aaC
car
car
cxF
@@ -154514,16 +154571,16 @@ asy
atW
avf
awi
axD
ayM
axD
aar
aav
aar
awf
aCp
aDs
aEv
aFE
aHh
aID
aaG
aKb
aLv
aMG
@@ -155037,7 +155094,7 @@ aDt
aEx
aFG
aHj
aIF
aaH
aKd
aLx
aMG
@@ -155797,8 +155854,8 @@ aad
alT
alT
alT
avk
avk
aaF
aaF
alT
alT
azZ
@@ -159140,7 +159197,7 @@ asL
aue
avt
aws
axN
aaI
ayY
aAc
aBo
@@ -170534,7 +170591,7 @@ cNz
dbm
dcX
dev
cPy
aaQ
dhe
diz
dkp
@@ -171296,7 +171353,7 @@ cKE
bsE
cNE
cPy
cRa
aaN
cSK
cUE
cQX
@@ -174892,7 +174949,7 @@ cIc
cAm
cKO
cMm
cNO
aaM
vEq
cRi
cSV
@@ -180771,7 +180828,7 @@ bFP
bHI
bJC
bLs
bNp
aaK
bNp
bNp
bTi
@@ -181018,7 +181075,7 @@ bpp
bru
btt
buQ
bwj
aaJ
bhd
byO
bAs
@@ -181804,7 +181861,7 @@ bPA
bRw
bTk
bVr
bXR
aaL
bZY
cbL
bLs
+17 -17
View File
@@ -53,6 +53,17 @@
"aaf" = (
/turf/closed/wall/r_wall,
/area/security/brig)
"aag" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/caution/stand_clear,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plasteel/dark,
/area/engine/supermatter)
"aah" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -72321,17 +72332,6 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/ai_monitored/security/armory)
"cin" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/caution/stand_clear,
/turf/open/floor/plasteel/dark,
/area/engine/supermatter)
"cio" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -122951,9 +122951,9 @@ coc
azE
brn
aLF
cin
cin
cin
aag
aag
aag
aLF
cut
cuO
@@ -125007,9 +125007,9 @@ cos
aAd
bFh
aLF
cin
cin
cin
aag
aag
aag
aLF
cuA
cuW
+285 -226
View File
@@ -2,10 +2,77 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 24
},
/obj/structure/rack,
/obj/item/grenade/barrier{
pixel_x = -3;
pixel_y = 1
},
/obj/item/grenade/barrier,
/obj/item/grenade/barrier{
pixel_x = 3;
pixel_y = -1
},
/obj/item/grenade/barrier{
pixel_x = 6;
pixel_y = -2
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/nt_storm_officer{
pixel_x = -32
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aac" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aad" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/nt_storm{
pixel_x = 32
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aae" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aaf" = (
/obj/structure/lattice,
/turf/open/space,
@@ -246,6 +313,19 @@
},
/turf/open/floor/plating,
/area/security/prison)
"aaM" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aaN" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -288,6 +368,58 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"aaU" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/crowbar,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aaV" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aaW" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/door/poddoor/shutters/window{
id = "armory";
name = "Armoury Shutters"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aaX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aaY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -322,6 +454,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/security/prison)
"abd" = (
/obj/machinery/vending/cola/random,
/obj/structure/sign/poster/official/pda_ad600{
pixel_x = -32
},
/obj/structure/sign/poster/official/pda_ad800{
pixel_x = -32;
pixel_y = 32
},
/obj/structure/sign/poster/official/pda_ad{
pixel_y = 32
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/command)
"abe" = (
/turf/closed/wall,
/area/security/prison)
@@ -376,6 +522,14 @@
/obj/item/canvas/twentythreeXtwentythree,
/turf/open/floor/plasteel,
/area/security/prison)
"abk" = (
/obj/structure/kitchenspike_frame,
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/structure/sign/poster/contraband/scum{
pixel_y = -32
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"abl" = (
/obj/structure/table,
/obj/machinery/computer/libraryconsole/bookmanagement,
@@ -445,6 +599,25 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/security/prison)
"abt" = (
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/hydro_ad{
pixel_x = -32
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"abu" = (
/obj/docking_port/stationary{
dwidth = 1;
@@ -521,6 +694,16 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
"abE" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/sign/poster/official/hydro_ad{
pixel_y = -32
},
/turf/open/floor/plasteel,
/area/hydroponics)
"abF" = (
/obj/structure/table,
/obj/structure/cable/yellow{
@@ -542,6 +725,30 @@
/obj/item/toy/cards/deck,
/turf/open/floor/plasteel,
/area/security/prison)
"abH" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_y = 32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"abI" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -723,6 +930,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/security/prison)
"acd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ace" = (
/obj/machinery/vending/sustenance{
desc = "A vending machine normally reserved for work camps.";
@@ -1388,6 +1605,22 @@
},
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"adk" = (
/obj/structure/sign/poster/contraband/scum{
pixel_y = -32
},
/turf/open/floor/plating,
/area/maintenance/fore)
"adl" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
},
/obj/item/storage/box/donkpockets,
/obj/structure/sign/poster/contraband/scum{
pixel_y = -32
},
/turf/open/floor/plating,
/area/maintenance/fore)
"adm" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -1568,6 +1801,35 @@
},
/turf/open/space,
/area/space/nearstation)
"adH" = (
/obj/structure/closet/wardrobe/grey,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/poster/official/fashion{
pixel_y = -32
},
/obj/structure/sign/poster/official/fashion{
pixel_y = -32
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"adI" = (
/obj/structure/rack,
/obj/item/hatchet,
/obj/item/reagent_containers/blood/random,
/obj/structure/sign/poster/contraband/scum{
pixel_y = -32
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"adJ" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -2918,37 +3180,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"afZ" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 24
},
/obj/structure/rack,
/obj/item/grenade/barrier{
pixel_x = -3;
pixel_y = 1
},
/obj/item/grenade/barrier,
/obj/item/grenade/barrier{
pixel_x = 3;
pixel_y = -1
},
/obj/item/grenade/barrier{
pixel_x = 6;
pixel_y = -2
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"aga" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -3427,26 +3658,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
"agQ" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agR" = (
/obj/machinery/airalarm{
dir = 4;
@@ -4781,23 +4992,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/warden)
"ajs" = (
/obj/machinery/door/poddoor/shutters{
id = "armory";
name = "armory shutters"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"ajt" = (
/obj/structure/closet{
name = "Evidence Closet 5"
@@ -11663,13 +11857,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"awA" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
},
/obj/item/storage/box/donkpockets,
/turf/open/floor/plating,
/area/maintenance/fore)
"awB" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/storage/box/lights/mixed,
@@ -16876,11 +17063,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aGW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aGX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -21786,20 +21968,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aRq" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aRr" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -22834,15 +23002,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"aTF" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aTG" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -23483,20 +23642,6 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"aUO" = (
/obj/structure/closet/wardrobe/grey,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"aUP" = (
/obj/structure/closet/wardrobe/white,
/obj/effect/turf_decal/tile/neutral{
@@ -26034,19 +26179,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aZJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aZK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/shower{
@@ -39514,10 +39646,6 @@
"bzJ" = (
/turf/closed/wall,
/area/hallway/secondary/command)
"bzK" = (
/obj/machinery/vending/cola/random,
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/command)
"bzL" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -53582,22 +53710,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"ccp" = (
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/central)
"ccq" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people,
@@ -56716,27 +56828,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cik" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cil" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -61846,12 +61937,6 @@
/obj/item/gun/syringe/dart,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"csb" = (
/obj/structure/rack,
/obj/item/hatchet,
/obj/item/reagent_containers/blood/random,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"csc" = (
/obj/machinery/iv_drip,
/obj/item/roller,
@@ -80107,27 +80192,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/science/xenobiology)
"djt" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"djx" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/crowbar,
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"djz" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -81817,11 +81881,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/security/vacantoffice)
"hvt" = (
/obj/structure/kitchenspike_frame,
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"hyP" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
@@ -99850,7 +99909,7 @@ dux
iLj
dvt
bXE
hvt
abk
dux
dux
dux
@@ -105768,7 +105827,7 @@ cdr
cew
cfL
bXK
cik
abH
cjK
clj
cmr
@@ -106515,7 +106574,7 @@ bsM
bun
bwi
bkz
bzK
abd
bBz
bDa
bEE
@@ -110319,7 +110378,7 @@ aaa
aaf
aeq
aeq
afZ
aab
agR
ahE
aiA
@@ -110394,7 +110453,7 @@ cdG
caq
cgb
chg
chg
acd
chg
clx
cmD
@@ -111607,7 +111666,7 @@ afX
agc
dBX
agc
ajs
aaW
ajz
akI
amc
@@ -111861,7 +111920,7 @@ aaa
aaf
aeq
aeq
agQ
aad
ahC
ahI
aeq
@@ -115529,7 +115588,7 @@ bWH
bYc
bZq
caG
ccp
abt
bSS
ceZ
cgo
@@ -116750,7 +116809,7 @@ agq
agq
aje
alb
aje
adk
agq
aur
aqb
@@ -117034,7 +117093,7 @@ aOt
aQU
aSg
aTt
aUO
adH
aUM
boW
aZt
@@ -117272,7 +117331,7 @@ ary
asR
aje
auc
awA
adl
axC
ayK
aAa
@@ -117842,7 +117901,7 @@ bWQ
soe
bWQ
caL
ccv
abE
bST
csg
cgq
@@ -121195,7 +121254,7 @@ dwX
ciL
ciL
cou
csb
adI
dvY
mjJ
krD
@@ -123201,7 +123260,7 @@ axY
aPY
aRn
aSt
aTF
aaV
aUY
aWA
aYp
@@ -123962,7 +124021,7 @@ aBK
aCS
aEo
aFw
aGW
aHY
aHY
aHY
aKB
@@ -123970,7 +124029,7 @@ aMd
aNr
aOP
dCw
aRq
aaM
aSw
aTI
aVb
@@ -124233,7 +124292,7 @@ aTJ
dfX
aWD
aVc
aZJ
aaX
bbz
bcK
bel
@@ -126275,7 +126334,7 @@ ddZ
ded
del
des
djt
aae
daY
daZ
dbb
@@ -126283,7 +126342,7 @@ aMk
aNv
dfk
dfq
djt
aae
dfG
dfQ
dfZ
@@ -126532,7 +126591,7 @@ aBQ
dee
aEr
des
djt
aae
daY
daZ
dbb
@@ -126540,7 +126599,7 @@ dfa
aNv
dfk
daY
djx
aaU
dfG
cXz
aVe
@@ -126789,7 +126848,7 @@ aBQ
dee
aEr
aKL
djt
aae
daY
deS
dbb
@@ -126797,7 +126856,7 @@ aMk
aNv
dfm
daY
djt
aae
dbg
dfR
dga
+117 -97
View File
@@ -950,6 +950,23 @@
},
/turf/open/floor/plasteel/dark,
/area/bridge)
"abn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"abo" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -1257,6 +1274,20 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
"abQ" = (
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/gravity_generator)
"abR" = (
/obj/structure/lattice,
/turf/open/space,
@@ -1638,6 +1669,54 @@
},
/turf/open/floor/plasteel,
/area/maintenance/starboard)
"acz" = (
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"acA" = (
/obj/structure/cable/white,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/gravity_generator)
"acB" = (
/obj/structure/cable/white,
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"acC" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"acD" = (
/obj/item/pickaxe/emergency,
/turf/open/floor/plating/asteroid,
@@ -2076,6 +2155,33 @@
/obj/structure/sign/warning/vacuum,
/turf/open/floor/plating,
/area/quartermaster/storage)
"adr" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"ads" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"adv" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
@@ -18300,19 +18406,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"aGl" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/engine/engineering)
"aGm" = (
/obj/structure/sign/warning/radiation,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -20085,16 +20178,6 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aJo" = (
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/gravity_generator)
"aJp" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -20171,16 +20254,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"aJA" = (
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/engineering)
"aJB" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
@@ -21472,14 +21545,6 @@
/obj/item/clothing/glasses/meson/engine,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aLL" = (
/obj/structure/cable/white,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/gravity_generator)
"aLM" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -21574,11 +21639,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"aLX" = (
/obj/structure/cable/white,
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/engineering)
"aLY" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -22553,20 +22613,6 @@
/obj/machinery/power/supermatter_crystal/shard/engine,
/turf/open/floor/engine,
/area/engine/supermatter)
"aOb" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aOd" = (
/obj/machinery/power/apc{
areastring = "/area/engine/engineering";
@@ -22788,19 +22834,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"aOB" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aOC" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -22827,19 +22860,6 @@
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aOE" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aOF" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -72989,9 +73009,9 @@ aFq
aGf
sIA
aIe
aJo
abQ
aKx
aLL
acA
aMN
aMN
sJD
@@ -73763,9 +73783,9 @@ aIh
aJr
aKz
aLO
aOB
aOB
aOB
acC
acC
acC
aLU
aQK
aRH
@@ -75042,7 +75062,7 @@ kaA
aDr
aEv
aFx
aGl
abn
aHp
aIm
bxa
@@ -75819,9 +75839,9 @@ aIp
aJw
aKE
aLU
aOE
aOb
aOE
adr
ads
adr
aLO
blK
aRP
@@ -76587,9 +76607,9 @@ aDv
aDv
aHv
sHV
aJA
acz
aKH
aLX
acB
aEt
aEt
aOH
+300 -207
View File
@@ -2,12 +2,267 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/machinery/holopad,
/obj/effect/landmark/start/cyborg,
/mob/living/simple_animal/bot/secbot/pingsky,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aac" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aad" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/maintenance/department/science)
"aae" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaf" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aag" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aah" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aai" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaj" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aak" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aal" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 9
},
/turf/open/floor/plating,
/area/engine/engineering)
"aam" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aan" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aao" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aap" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aaq" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/engineering)
"aar" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/item/tank/internals/plasma,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aas" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/oil,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"aat" = (
/obj/structure/closet/wardrobe/green,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/sign/poster/official/fashion{
pixel_y = -32
},
/obj/structure/sign/poster/official/fashion{
pixel_y = -32
},
/turf/open/floor/plasteel/white/corner,
/area/crew_quarters/fitness/recreation)
"aau" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/structure/sign/poster/official/hydro_ad{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/hydroponics)
"aav" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"aaw" = (
/obj/structure/sign/poster/official/hydro_ad,
/turf/closed/wall,
/area/hydroponics)
"aax" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = 32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"aay" = (
/obj/structure/sign/poster/official/medical_green_cross,
/turf/closed/wall,
/area/medical/medbay/central)
"aaz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/sign/poster/official/medical_green_cross{
pixel_x = 32;
pixel_y = -32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"aaA" = (
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/turf/open/floor/plating,
/area/maintenance/department/science)
"aaB" = (
/obj/structure/closet/masks,
/obj/item/reagent_containers/food/snacks/deadmouse,
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
"aaC" = (
/obj/structure/sign/poster/contraband/scum{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/maintenance/department/engine)
"abf" = (
/obj/structure/bed,
/turf/open/floor/plating,
@@ -1589,12 +1844,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afP" = (
/obj/machinery/holopad,
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -11506,13 +11755,6 @@
},
/turf/open/floor/plasteel/white/corner,
/area/crew_quarters/fitness/recreation)
"aBV" = (
/obj/structure/closet/wardrobe/green,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/white/corner,
/area/crew_quarters/fitness/recreation)
"aBW" = (
/obj/structure/closet/wardrobe/grey,
/obj/machinery/light,
@@ -15182,13 +15424,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"aKm" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
},
/turf/open/floor/plating,
/area/engine/engineering)
"aKn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -18463,10 +18698,6 @@
},
/turf/open/floor/plasteel,
/area/hydroponics)
"aSD" = (
/obj/structure/closet/secure_closet/hydroponics,
/turf/open/floor/plasteel,
/area/hydroponics)
"aSE" = (
/obj/machinery/airalarm{
pixel_y = 24
@@ -19833,11 +20064,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"aVF" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"aVG" = (
/obj/structure/easel,
/turf/open/floor/plating,
@@ -27844,14 +28070,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"boB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"boC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/dark,
@@ -31673,13 +31891,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bwM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bwN" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -36749,11 +36960,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/engine)
"bGL" = (
/obj/structure/closet/masks,
/obj/item/reagent_containers/food/snacks/deadmouse,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bGM" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/plating,
@@ -46083,13 +46289,6 @@
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall/r_wall,
/area/engine/engineering)
"ccd" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/engine/engineering)
"cci" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
@@ -47013,17 +47212,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"cfV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/engine/engineering)
"cfX" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 1
@@ -47378,23 +47566,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"chw" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/turf/open/floor/plating,
/area/engine/engineering)
"chA" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
"chB" = (
/obj/item/seeds/banana,
/obj/item/seeds/grass,
@@ -54807,17 +54978,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/science)
"hQy" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/item/tank/internals/plasma,
/turf/open/floor/plating,
/area/engine/supermatter)
"hQz" = (
/obj/structure/closet/emcloset/anchored,
/obj/structure/cable/yellow{
@@ -55157,11 +55317,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"izm" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/engine/engineering)
"izB" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod"
@@ -56542,13 +56697,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
"lRX" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 9
},
/turf/open/floor/plating,
/area/engine/engineering)
"lTC" = (
/obj/item/shard,
/obj/effect/turf_decal/stripes/line{
@@ -57810,13 +57958,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"oJr" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plating,
/area/engine/engineering)
"oKa" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -58798,11 +58939,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
"qOS" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/engine/engineering)
"qPB" = (
/obj/structure/chair/stool,
/obj/machinery/light/small{
@@ -59976,13 +60112,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"tQT" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/engine/engineering)
"tRc" = (
/obj/structure/ore_box,
/turf/open/floor/plating{
@@ -60180,17 +60309,6 @@
luminosity = 2
},
/area/maintenance/department/science)
"uoq" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/engine/supermatter)
"uos" = (
/obj/machinery/computer/camera_advanced/base_construction,
/obj/effect/turf_decal/stripes/line{
@@ -60626,13 +60744,6 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"vor" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/engine/engineering)
"vpz" = (
/obj/structure/girder,
/turf/open/floor/plating{
@@ -61074,17 +61185,6 @@
/obj/structure/sign/warning,
/turf/closed/wall,
/area/science/mixing)
"woh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/engine/supermatter)
"woq" = (
/obj/structure/chair,
/turf/open/floor/plating,
@@ -61228,13 +61328,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
"wHI" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
},
/turf/open/floor/plating,
/area/engine/engineering)
"wIo" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/obj/structure/lattice,
@@ -83932,7 +84025,7 @@ bBX
bva
bEm
bva
bGL
aaB
bHQ
bJe
bKj
@@ -85497,7 +85590,7 @@ bSw
bva
bOB
bva
kRq
aaC
kRq
kRq
bva
@@ -87507,7 +87600,7 @@ aVS
aVS
aVS
aVS
aRL
aaw
aJI
aDZ
aHN
@@ -88030,7 +88123,7 @@ bjR
blc
biX
bny
boB
aax
bpF
brd
bsz
@@ -88522,7 +88615,7 @@ aKP
aPz
aQJ
aRL
aSD
aau
aTT
aXS
aRL
@@ -90606,7 +90699,7 @@ brg
bsG
brf
bvn
bwM
aaz
byt
bzX
bpP
@@ -90905,9 +90998,9 @@ svA
mjK
mjK
mjK
wHI
eyj
eyj
aap
aac
aac
bXk
shH
shH
@@ -91157,7 +91250,7 @@ cah
cdO
ioF
ceX
qOS
aah
cfS
fFv
fmL
@@ -91631,7 +91724,7 @@ bnD
boJ
bpS
bjd
bjc
aay
cqm
bvl
bwP
@@ -91671,7 +91764,7 @@ cbh
cbh
cbh
hjD
vor
aai
cfU
tIS
iCs
@@ -91929,12 +92022,12 @@ irM
qFu
cet
ulY
cfV
aak
cgu
cgU
izm
chw
eyj
aam
aaq
aac
jzE
bXk
bXk
@@ -92181,9 +92274,9 @@ bZA
can
cbi
ccc
eyj
aac
cdR
tQT
aaf
bXk
bXk
sWW
@@ -92437,12 +92530,12 @@ bYR
bZA
can
cbj
eyj
aac
cbX
wcs
iyJ
cfa
eyj
aac
twv
hoS
sWj
@@ -92694,7 +92787,7 @@ bYS
bZA
can
qpS
ccd
aae
ccX
ccX
ceu
@@ -92703,9 +92796,9 @@ cfu
tlN
ncm
cCI
uoq
hQy
chA
aan
aar
aao
meF
oKv
wbB
@@ -92951,12 +93044,12 @@ bYT
bZB
caq
cbk
eyj
aac
ccY
cdT
ccY
cbX
eyj
aac
vlC
iej
qeY
@@ -93208,7 +93301,7 @@ bYU
bZE
car
mgz
eyj
aac
cbX
wcs
wcs
@@ -94236,7 +94329,7 @@ bYQ
bZA
cam
mgz
eyj
aac
cbX
wcs
wcs
@@ -94493,12 +94586,12 @@ wjm
bZF
cbm
mgz
eyj
aac
oHa
oHa
eWi
cbX
eyj
aac
vlC
cgx
qeY
@@ -94750,7 +94843,7 @@ bYO
bZA
cam
lrM
ccd
aae
cAQ
cAQ
cLw
@@ -94759,9 +94852,9 @@ cfu
jBn
oxw
meF
chA
chA
woh
aao
aao
aas
cCI
cBS
iLh
@@ -94900,7 +94993,7 @@ aey
aeO
aff
afy
afP
aab
bIK
agt
agD
@@ -95007,12 +95100,12 @@ bYY
bZA
cam
cbn
eyj
aac
cbX
wcs
cfP
cff
eyj
aac
cfX
vVO
iop
@@ -95265,9 +95358,9 @@ bZG
cax
cbo
ccc
eyj
aac
cdR
oJr
aag
bXq
bXq
cfY
@@ -95527,7 +95620,7 @@ kTj
qhE
loz
frj
lRX
aal
eyj
uIB
eyj
@@ -95783,7 +95876,7 @@ cam
cam
cam
haA
aKm
aaj
upc
wIo
hyh
@@ -96040,7 +96133,7 @@ cCV
ceb
epV
qLI
aKm
aaj
eiV
upc
dsz
@@ -103154,7 +103247,7 @@ axx
ayv
azD
aAS
aBV
aat
atn
aEh
aFe
@@ -107799,7 +107892,7 @@ sZh
aLm
aTx
aEj
aVF
aav
aFi
aFi
aFi
@@ -109372,7 +109465,7 @@ blX
blX
blX
bkF
lWy
aaA
lWy
fKj
lWy
+1
View File
@@ -236,6 +236,7 @@
#define APHRO_TRAIT "aphro"
#define BLOODSUCKER_TRAIT "bloodsucker"
#define CLOTHING_TRAIT "clothing" //used for quirky carrygloves
#define SHOES_TRAIT "shoes" //inherited from your sweet kicks
// unique trait sources, still defines
#define STATUE_MUTE "statue"
+3 -3
View File
@@ -320,8 +320,8 @@
parts += "[FOURSPACES]<i>Nobody died this shift!</i>"
if(istype(SSticker.mode, /datum/game_mode/dynamic))
var/datum/game_mode/dynamic/mode = SSticker.mode
parts += "[FOURSPACES]Threat level: [mode.threat_level]"
parts += "[FOURSPACES]Threat left: [mode.threat]"
parts += "[FOURSPACES]Final threat level: [mode.threat_level]"
parts += "[FOURSPACES]Final threat: [mode.threat]"
parts += "[FOURSPACES]Executed rules:"
for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - <b>[rule.name]</b>: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat"
@@ -331,7 +331,7 @@
for(var/entry in mode.threat_tallies)
parts += "[FOURSPACES][FOURSPACES][entry] added [mode.threat_tallies[entry]]"
SSblackbox.record_feedback("tally","dynamic_threat",mode.threat_level,"Final threat level")
SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Threat left")
SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Final Threat")
return parts.Join("<br>")
/client/proc/roundend_report_file()
@@ -400,6 +400,10 @@
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
/datum/config_entry/keyed_list/antag_threat
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_NUM
/datum/config_entry/number/monkeycap
config_entry_value = 64
min_val = 0
+2 -2
View File
@@ -72,9 +72,9 @@
return {"<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
[head_content]
</head>
<body scroll=auto>
+1
View File
@@ -175,6 +175,7 @@
var/html = {"
<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>[title]</title>
<style>
body {
+4 -4
View File
@@ -412,13 +412,13 @@
switch(deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 4))
if(G_MALE)
set_gender(MALE, TRUE)
set_gender(MALE, TRUE, forced = TRUE)
if(G_FEMALE)
set_gender(FEMALE, TRUE)
set_gender(FEMALE, TRUE, forced = TRUE)
if(G_PLURAL)
set_gender(PLURAL, TRUE)
set_gender(PLURAL, TRUE, forced = TRUE)
else
set_gender(NEUTER, TRUE)
set_gender(NEUTER, TRUE, forced = TRUE)
/mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)
..()
+1 -1
View File
@@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
var/atom/target = locate(href_list["show_flavor"])
var/text = texts_by_atom[target]
if(text)
usr << browse("<HTML><HEAD><TITLE>[target.name]</TITLE></HEAD><BODY><TT>[replacetext(texts_by_atom[target], "\n", "<BR>")]</TT></BODY></HTML>", "window=[target.name];size=500x200")
usr << browse("<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[target.name]</TITLE></HEAD><BODY><TT>[replacetext(texts_by_atom[target], "\n", "<BR>")]</TT></BODY></HTML>", "window=[target.name];size=500x200")
onclose(usr, "[target.name]")
return TRUE
+1 -1
View File
@@ -15,4 +15,4 @@
/datum/element/sword_point/proc/point(datum/source, atom/target, mob/user, proximity_flag, params)
if(!proximity_flag && ismob(target))
user.visible_message("<span class='notice'>[user] points the tip of [source] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
user.visible_message("<span class='notice'>[user] points the tip of [source] at [target].</span>", "<span class='notice'>You point the tip of [source] at [target].</span>")
+5 -3
View File
@@ -18,7 +18,6 @@
name = "Asteroid 1"
description = "I-spy with my little eye, something beginning with R."
/datum/map_template/ruin/space/asteroid2
id = "asteroid2"
suffix = "asteroid2.dmm"
@@ -187,6 +186,7 @@
name = "Abandoned Teleporter"
description = "In space construction the teleporter is often the first system brought online. \
This lonely half built teleporter is a sign of a proposed structure that for one reason or another just never got built."
always_place = TRUE
/datum/map_template/ruin/space/crashedclownship
id = "crashedclownship"
@@ -268,6 +268,7 @@
suffix = "whiteshipdock.dmm"
name = "Whiteship Dock"
description = "An abandoned but functional vessel parked in deep space, ripe for the taking."
always_place = TRUE
/datum/map_template/ruin/space/cat_experiments
id = "meow"
@@ -287,6 +288,7 @@
suffix = "hilbertshoteltestingsite.dmm"
name = "Hilbert Research Facility"
description = "A research facility of great bluespace discoveries. Long since abandoned, willingly or not..."
/datum/map_template/ruin/space/augmentation
id = "augmentationfacility"
suffix = "augmentationfacility.dmm"
@@ -376,13 +378,13 @@
id = "roid8"
suffix = "roid8.dmm"
name = "Dead wizard Roid"
description = "Mineral asteroid. Ft. Dead wizard and toilet paradox bag."
description = "Mineral asteroid. Ft. Dead wizard and toilet wand."
/datum/map_template/ruin/spacenearstation/roid9
id = "roid9"
suffix = "roid9.dmm"
name = "Monitoring Roid"
description = "Mineral asteroid. Ft. Station monitoring, syndie toolbox and erp."
description = "Mineral asteroid. Ft. Station monitoring, toolbox and erp."
/datum/map_template/ruin/spacenearstation/roid10
id = "roid10"
+1 -1
View File
@@ -353,5 +353,5 @@ Credit where due:
/obj/item/paper/servant_primer/oui_getcontent(mob/target)
if(!is_servant_of_ratvar(target) && !isobserver(target))
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
return "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
return ..()
+12 -11
View File
@@ -57,13 +57,13 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
/// Target threat level right now. Events and antags will try to keep the round at this level.
var/threat_level = 0
/// The current antag threat. Recalculated every time a ruletype starts or ends.
var/threat = 0
var/threat = 0
/// Starting threat level, for things that increase it but can bring it back down.
var/initial_threat_level = 0
/// Things that cause a rolling threat adjustment to be displayed at roundend.
var/list/threat_tallies = list()
/// Running information about the threat. Can store text or datum entries.
var/list/threat_log = list()
var/list/threat_log = list()
/// As above, but with info such as refunds.
var/list/threat_log_verbose = list()
/// List of roundstart rules used for selecting the rules.
@@ -150,11 +150,11 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
GLOB.dynamic_first_midround_delay_max = CONFIG_GET(number/dynamic_first_midround_delay_max)*600
/datum/game_mode/dynamic/admin_panel()
var/list/dat = list("<html><head><title>Game Mode Panel</title></head><body><h1><B>Game Mode Panel</B></h1>")
var/list/dat = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Game Mode Panel</title></head><body><h1><B>Game Mode Panel</B></h1>")
dat += "Dynamic Mode <a href='?_src_=vars;[HrefToken()];Vars=[REF(src)]'>\[VV\]</A><a href='?src=\ref[src];[HrefToken()]'>\[Refresh\]</A><BR>"
dat += "Threat Level: <b>[threat_level]</b><br/>"
dat += "Target threat: <b>[threat_level]</b><br/>"
dat += "Threat to Spend: <b>[threat]</b> <a href='?src=\ref[src];[HrefToken()];adjustthreat=1'>\[Adjust\]</A> <a href='?src=\ref[src];[HrefToken()];threatlog=1'>\[View Log\]</a><br/>"
dat += "Current threat: <b>[threat]</b> <a href='?src=\ref[src];[HrefToken()];adjustthreat=1'>\[Adjust\]</A> <a href='?src=\ref[src];[HrefToken()];threatlog=1'>\[View Log\]</a><br/>"
dat += "<br/>"
dat += "Storyteller: <b>[storyteller.name]</b><br/>"
dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].<br/>"
@@ -339,9 +339,10 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
storyteller = new GLOB.dynamic_storyteller_type // this is where all the initialization happens
storyteller.on_start()
SSblackbox.record_feedback("text","dynamic_storyteller",1,storyteller.name)
message_admins("Dynamic mode parameters for the round:")
message_admins("Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
message_admins("Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
message_admins("Dynamic mode parameters for the round:\n\
Storyteller is [storyteller.name].\n\
Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].\n\
Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
log_game("DYNAMIC: Dynamic mode parameters for the round:")
log_game("DYNAMIC: Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
@@ -403,7 +404,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
/datum/game_mode/dynamic/post_setup(report)
update_playercounts()
for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules)
addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay)
..()
@@ -641,7 +642,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
return TRUE
stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.")
return FALSE
/datum/game_mode/dynamic/process()
if (pop_last_updated < world.time - (120 SECONDS))
pop_last_updated = world.time
@@ -654,7 +655,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info())
storyteller.do_process()
if (midround_injection_cooldown < world.time)
if (GLOB.dynamic_forced_extended)
return
@@ -106,7 +106,7 @@
if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
var/threat = round(mode.threat_level/10)
var/threat = CLAMP(round(mode.threat_level/10),1,10)
if (job_check < required_enemies[threat])
SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough enemy roles")
return FALSE
@@ -216,7 +216,7 @@
var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len
var/antag_count = mode.current_players[CURRENT_LIVING_ANTAGS].len
var/max_traitors = round(player_count / 10) + 1
if ((antag_count < max_traitors) && prob(mode.threat_level))//adding traitors if the antag population is getting low
if ((antag_count < max_traitors) && prob(min(100,mode.threat_level)))//adding traitors if the antag population is getting low
return ..()
else
return FALSE
@@ -53,11 +53,13 @@ Property weights are:
if(H.stat != DEAD && is_station_level(T.z) && !("Station" in H.faction))
threat += H.threat()
for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
if (M.stat != DEAD && M.mind && M.mind.assigned_role)
if(length(M.mind.antag_datums))
threat += SSjob.GetJob(M.mind.assigned_role).GetThreat()
else
threat -= SSjob.GetJob(M.mind.assigned_role).GetThreat()
if (M?.mind?.assigned_role && M.stat != DEAD)
var/datum/job/J = SSjob.GetJob(M.mind.assigned_role)
if(J)
if(length(M.mind.antag_datums))
threat += J.GetThreat()
else
threat -= J.GetThreat()
threat += (mode.current_players[CURRENT_DEAD_PLAYERS].len)*dead_player_weight
return round(threat,0.1)
+2 -2
View File
@@ -240,10 +240,10 @@
to_chat(AI, "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
else
to_chat(AI, "<b><a href='?src=[REF(AI)];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
AI.last_paper_seen = "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
else if (O.client && O.client.eye == src)
to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
O << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
O << browse(text("<HTML><HEAD<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
return
else if(istype(I, /obj/item/camera_bug))
+1
View File
@@ -61,6 +61,7 @@
icon = 'icons/obj/doors/shutters_window.dmi'
icon_state = "closed"
opacity = 0
glass = 1
/obj/machinery/door/poddoor/shutters/window/preopen
icon_state = "open"
@@ -141,7 +141,7 @@
if(href_list["photo"])
var/mob/M = usr
M << browse_rsc(picture.picture_image, "pda_photo.png")
M << browse("<html><head><title>PDA Photo</title></head>" \
M << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>PDA Photo</title></head>" \
+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
+ "<img src='pda_photo.png' width='192' style='-ms-interpolation-mode:nearest-neighbor' />" \
+ "</body></html>", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
+3 -1
View File
@@ -42,7 +42,9 @@
/obj/mecha/combat/honker/get_stats_html()
var/output = {"<html>
<head><title>[src.name] data</title>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>[src.name] data</title>
<style>
body {color: #00ff00; background: #32CD32; font-family:"Courier",monospace; font-size: 12px;}
hr {border: 1px solid #0f0; color: #fff; background-color: #000;}
@@ -125,6 +125,7 @@
return
return {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>[patient] statistics</title>
<script language='javascript' type='text/javascript'>
[js_byjax]
@@ -259,7 +260,8 @@
. = ..()
create_reagents(max_volume, NO_REACT)
syringes = new
known_reagents = list(/datum/reagent/medicine/epinephrine = "Epinephrine", /datum/reagent/medicine/charcoal = "Charcoal")
known_reagents = list(/datum/reagent/medicine/epinephrine = "Epinephrine", /datum/reagent/medicine/charcoal = "Charcoal", /datum/reagent/medicine/prussian_blue = "Prussian Blue", \
/datum/reagent/medicine/dexalin = "Dexalin", /datum/reagent/medicine/insulin = "Insulin", /datum/reagent/medicine/kelotane = "Kelotane", /datum/reagent/medicine/bicaridine = "Bicaridine")
processed_reagents = new
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach()
@@ -390,6 +392,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/get_reagents_page()
var/output = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>Reagent Synthesizer</title>
<script language='javascript' type='text/javascript'>
[js_byjax]
+2 -1
View File
@@ -297,7 +297,8 @@
left_part += "<hr><a href='?src=[REF(src)];screen=main'>Return</a>"
dat = {"<html>
<head>
<title>[name]</title>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>[name] data</title>
<style>
.res_name {font-weight: bold; text-transform: capitalize;}
.red {color: #f00;}
+1 -1
View File
@@ -11,7 +11,7 @@
/obj/machinery/computer/mecha/ui_interact(mob/user)
. = ..()
var/dat = "<html><head><title>[src.name]</title><style>h3 {margin: 0px; padding: 0px;}</style></head><body>"
var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[src.name]</title><style>h3 {margin: 0px; padding: 0px;}</style></head><body>"
if(screen == 0)
dat += "<h3>Tracking beacons data</h3>"
var/list/trackerlist = list()
+8 -3
View File
@@ -5,7 +5,9 @@
/obj/mecha/proc/get_stats_html()
. = {"<html>
<head><title>[src.name] data</title>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>[name] data</title>
<style>
body {color: #00ff00; background: #000000; font-family:"Lucida Console",monospace; font-size: 12px;}
hr {border: 1px solid #0f0; color: #0f0; background-color: #0f0;}
@@ -149,7 +151,7 @@
/obj/mecha/proc/get_log_html()
. = "<html><head><title>[src.name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
. = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[src.name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
for(var/list/entry in log)
. += {"<div style='font-weight: bold;'>[entry["time"]] [time2text(entry["date"],"MMM DD")] [entry["year"]]</div>
<div style='margin-left:15px; margin-bottom:10px;'>[entry["message"]]</div>
@@ -162,7 +164,9 @@
if(!id_card || !user)
return
. = {"<html>
<head><style>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
h1 {font-size:15px;margin-bottom:4px;}
body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
a {color:#0f0;}
@@ -192,6 +196,7 @@
return
. = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
a {padding:2px 5px; background:#32CD32;color:#000;display:block;margin:2px;text-align:center;text-decoration:none;}
+2 -1
View File
@@ -13,7 +13,8 @@
/obj/item/areaeditor/attack_self(mob/user)
add_fingerprint(user)
. = "<BODY><HTML><head><title>[src]</title></head> \
. = "<BODY><HTML><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>\
<title>[src]</title></head> \
<h2>[station_name()] [src.name]</h2> \
<small>[fluffnotice]</small><hr>"
switch(get_area_type())
+2 -2
View File
@@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(PDAs)
user.set_machine(src)
var/dat = "<!DOCTYPE html><html><head><title>Personal Data Assistant</title><link href=\"https://fonts.googleapis.com/css?family=Orbitron|Share+Tech+Mono|VT323\" rel=\"stylesheet\"></head><body bgcolor=\"" + background_color + "\"><style>body{" + font_mode + "}ul,ol{list-style-type: none;}a, a:link, a:visited, a:active, a:hover { color: #000000;text-decoration:none; }img {border-style:none;}a img{padding-right: 9px;}</style>"
var/dat = "<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Personal Data Assistant</title><link href=\"https://fonts.googleapis.com/css?family=Orbitron|Share+Tech+Mono|VT323\" rel=\"stylesheet\"></head><body bgcolor=\"" + background_color + "\"><style>body{" + font_mode + "}ul,ol{list-style-type: none;}a, a:link, a:visited, a:active, a:hover { color: #000000;text-decoration:none; }img {border-style:none;}a img{padding-right: 9px;}</style>"
dat += assets.css_tag()
dat += emoji_s.css_tag()
@@ -1192,7 +1192,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if(incapacitated())
return
if(!isnull(aiPDA))
var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>[aiPDA.tnote]</body></html>"
var/HTML = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>AI PDA Message Log</title></head><body>[aiPDA.tnote]</body></html>"
user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
else
to_chat(user, "You do not have a PDA. You should make an issue report about this.")
+10
View File
@@ -14,6 +14,7 @@
//book contents below
dat = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
@@ -49,6 +50,7 @@
title = "APLU \"Ripley\" Construction and Operation Manual"
dat = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
@@ -122,6 +124,7 @@
title = "Chef Recipes"
dat = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
@@ -202,6 +205,10 @@
author = "Syndicate"
title = "Fission Mailed: Nuclear Sabotage 101"
dat = {"<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
</head>
<body>
Nuclear Explosives 101:<br>
Hello and thank you for choosing the Syndicate for your nuclear information needs.<br>
Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.<br>
@@ -229,6 +236,7 @@
<b>Disk, Code, Safety, Timer, Disk, RUN!</b><br>
Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk.<br>
Good luck!
</body>
</html>"}
// Wiki books that are linked to the configured wiki link.
@@ -249,6 +257,7 @@
dat = {"
<html><head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
iframe {
display: none;
@@ -284,6 +293,7 @@
dat = {"
<html><head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style>
iframe {
display: none;
+1 -1
View File
@@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
return
// If H is the Chaplain, we can set the icon_state of the bible (but only once!)
if(!GLOB.bible_icon_state && H.job == "Chaplain")
var/dat = "<html><head><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
for(var/i in 1 to GLOB.biblestates.len)
var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i])
var/nicename = GLOB.biblenames[i]
+1 -1
View File
@@ -89,7 +89,7 @@ FLOOR SAFES
var/obj/item/P = contents[i]
dat += "<tr><td><a href='?src=[REF(src)];retrieve=[REF(P)]'>[P.name]</a></td></tr>"
dat += "</table></center>"
user << browse("<html><head><title>[name]</title></head><body>[dat]</body></html>", "window=safe;size=350x300")
user << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[name]</title></head><body>[dat]</body></html>", "window=safe;size=350x300")
/obj/structure/safe/Topic(href, href_list)
if(!ishuman(usr))
+3
View File
@@ -47,6 +47,9 @@
// by default, vis_contents is inherited from the turf that was here before
vis_contents.Cut()
if(color)
add_atom_colour(color, FIXED_COLOUR_PRIORITY)
assemble_baseturfs()
levelupdate()
+1 -1
View File
@@ -25,7 +25,7 @@
to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.")
return
var/body = "<html><head><title>Options for [M.key]</title></head>"
var/body = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Options for [M.key]</title></head>"
body += "<body>Options panel for <b>[M]</b>"
if(M.client)
body += " played by <b>[M.client]</b> "
+1 -1
View File
@@ -136,7 +136,7 @@
if(!SSticker.HasRoundStarted())
alert("The game hasn't started yet!")
return
var/list/dat = list("<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>")
var/list/dat = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Round Status</title></head><body><h1><B>Round Status</B></h1>")
if(SSticker.mode.replacementmode)
dat += "Former Game Mode: <B>[SSticker.mode.name]</B><BR>"
dat += "Replacement Game Mode: <B>[SSticker.mode.replacementmode.name]</B><BR>"
+3 -1
View File
@@ -83,7 +83,9 @@
<hr style='background:#000000; border:0; height:1px'>"}
qdel(query_check_unused_rank)
else if(!action)
output += {"<head>
output += {"
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<title>Permissions Panel</title>
<script type='text/javascript' src='search.js'></script>
</head>
+1 -1
View File
@@ -2,7 +2,7 @@
if(!check_rights())
return
log_admin("[key_name(usr)] checked the player panel.")
var/dat = "<html><head><title>Player Panel</title></head>"
var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Player Panel</title></head>"
//javascript, the part that does most of the work~
dat += {"
+2 -2
View File
@@ -79,7 +79,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
title = "Resolved Tickets"
if(!l2b)
return
var/list/dat = list("<html><head><title>[title]</title></head>")
var/list/dat = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[title]</title></head>")
dat += "<A href='?_src_=holder;[HrefToken()];ahelp_tickets=[state]'>Refresh</A><br><br>"
for(var/I in l2b)
var/datum/admin_help/AH = I
@@ -401,7 +401,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//Show the ticket panel
/datum/admin_help/proc/TicketPanel()
var/list/dat = list("<html><head><title>Ticket #[id]</title></head>")
var/list/dat = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Ticket #[id]</title></head>")
var/ref_src = "[REF(src)]"
dat += "<h4>Admin Help Ticket #[id]: [LinkedReplyName(ref_src)]</h4>"
dat += "<b>State: "
+3 -3
View File
@@ -934,7 +934,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
id_select += "</select>"
var/dat = {"
<html><head><title>Create Outfit</title></head><body>
<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Create Outfit</title></head><body>
<form name="outfit" action="byond://?src=[REF(src)];[HrefToken()]" method="get">
<input type="hidden" name="src" value="[REF(src)]">
[HrefTokenFormField()]
@@ -1360,7 +1360,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
return
var/list/msg = list()
msg += "<html><head><title>Playtime Report</title></head><body>Playtime:<BR><UL>"
msg += "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Playtime Report</title></head><body>Playtime:<BR><UL>"
for(var/client/C in GLOB.clients)
msg += "<LI> - [key_name_admin(C)]: <A href='?_src_=holder;[HrefToken()];getplaytimewindow=[REF(C.mob)]'>" + C.get_exp_living() + "</a></LI>"
msg += "</UL></BODY></HTML>"
@@ -1377,7 +1377,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
return
var/list/body = list()
body += "<html><head><title>Playtime for [C.key]</title></head><BODY><BR>Playtime:"
body += "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Playtime for [C.key]</title></head><BODY><BR>Playtime:"
body += C.get_exp_report()
body += "<A href='?_src_=holder;[HrefToken()];toggleexempt=[REF(C)]'>Toggle Exempt status</a>"
body += "</BODY></HTML>"
@@ -241,6 +241,9 @@ GLOBAL_LIST_EMPTY(antagonists)
/// Gets our threat level. Defaults to threat var, override for custom stuff like different traitor goals having different threats.
/datum/antagonist/proc/threat()
. = CONFIG_GET(keyed_list/antag_threat)[lowertext(name)]
if(. == null)
return threat
return threat
//This one is created by admin tools for custom objectives
@@ -92,7 +92,7 @@
owner.current.blood_volume = max(owner.current.blood_volume,BLOOD_VOLUME_SAFE)
/datum/antagonist/bloodsucker/threat()
return threat+3*vamplevel
return ..()+3*vamplevel
/datum/antagonist/bloodsucker/proc/SelectFirstName()
@@ -16,7 +16,7 @@
threat = -3
/datum/antagonist/vamphunter/threat()
return bad_dude ? -threat : threat
return bad_dude ? -(..()) : ..()
/datum/antagonist/vamphunter/on_gain()
+1 -1
View File
@@ -114,7 +114,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
var/ascendable = FALSE
/datum/antagonist/devil/threat()
return threat + form * 10
return ..() + form * 10
/datum/antagonist/devil/can_be_owned(datum/mind/new_owner)
. = ..()
+2 -1
View File
@@ -4,12 +4,13 @@
job_rank = ROLE_NINJA
show_name_in_check_antagonists = TRUE
antag_moodlet = /datum/mood_event/focused
threat = 8
var/helping_station = FALSE
var/give_objectives = TRUE
var/give_equipment = TRUE
/datum/antagonist/ninja/threat()
return helping_station ? -8 : 8
return helping_station ? -(..()) : ..()
/datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override)
var/mob/living/M = mob_override || owner.current
@@ -96,6 +96,13 @@
equip(silent)
owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
/datum/antagonist/traitor/antag_panel_objectives()
. = ..()
if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets))
. += "<i><b>Contract Targets</b></i>:<br>"
for(var/datum/mind/M in contractor_hub.assigned_targets)
. += "<b> - </b>[key_name(M, FALSE, TRUE)]<br>"
/datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
. = ..()
update_traitor_icons_added()
@@ -292,4 +299,4 @@
return SSticker.mode.name == "traitor"
/datum/antagonist/traitor/threat()
return threat+traitor_kind.threat
return (..())+traitor_kind.threat
@@ -645,7 +645,7 @@
/obj/item/spellbook/proc/wrap(content)
var/dat = ""
dat +="<html><head><title>Spellbook</title></head>"
dat +="<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Spellbook</title></head>"
dat += {"
<head>
<style type="text/css">
-38
View File
@@ -164,17 +164,6 @@
/obj/item/shield/riot)
crate_name = "riot shields crate"
/datum/supply_pack/security/armory/riotshotguns
name = "Riot Shotgun Crate"
desc = "For when the greytide gets really uppity. Contains three riot shotguns, seven rubber shot and beanbag shells. Requires Armory access to open."
cost = 6500
contains = list(/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/storage/box/rubbershot,
/obj/item/storage/box/beanbag)
crate_name = "riot shotgun crate"
/datum/supply_pack/security/armory/russian
name = "Russian Surplus Crate"
desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open."
@@ -216,23 +205,6 @@
/obj/item/clothing/gloves/combat)
crate_name = "swat crate"
/datum/supply_pack/security/armory/swattasers //Lesser AEG tbh
name = "SWAT tactical tasers Crate"
desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open."
cost = 7000
contains = list(/obj/item/gun/energy/e_gun/stun,
/obj/item/gun/energy/e_gun/stun)
crate_name = "swat taser crate"
/datum/supply_pack/security/armory/woodstock
name = "WoodStock Classic Shotguns Crate"
desc = "Contains three rustic, pumpaction shotguns. Requires Armory access to open."
cost = 3000
contains = list(/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/shotgun)
crate_name = "woodstock shotguns crate"
/datum/supply_pack/security/armory/wt550
name = "WT-550 Semi-Auto Rifle Crate"
desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
@@ -260,13 +232,3 @@
/obj/item/ammo_box/magazine/wt550m9/wtrubber,
/obj/item/ammo_box/magazine/wt550m9/wtrubber)
crate_name = "auto rifle ammo crate"
/datum/supply_pack/security/armory/wt550ammo_special
name = "WT-550 Semi-Auto SMG Special Ammo Crate"
desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 3000
contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap,
/obj/item/ammo_box/magazine/wt550m9/wtap,
/obj/item/ammo_box/magazine/wt550m9/wtic,
/obj/item/ammo_box/magazine/wt550m9/wtic)
crate_name = "auto rifle ammo crate"
-24
View File
@@ -206,30 +206,6 @@
/obj/item/storage/box/mre/menu4/safe)
crate_name = "MRE crate (emergency rations)"
/datum/supply_pack/emergency/syndicate
name = "NULL_ENTRY"
desc = "(#@&^$THIS PACKAGE CONTAINS 30TC WORTH OF SOME RANDOM SYNDICATE GEAR WE HAD LYING AROUND THE WAREHOUSE. GIVE EM HELL, OPERATIVE@&!*() "
hidden = TRUE
cost = 20000
contains = list()
crate_name = "emergency crate"
crate_type = /obj/structure/closet/crate/internals
dangerous = TRUE
/datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C)
var/crate_value = 30
var/list/uplink_items = get_uplink_items(SSticker.mode)
while(crate_value)
var/category = pick(uplink_items)
var/item = pick(uplink_items[category])
var/datum/uplink_item/I = uplink_items[category][item]
if(!I.surplus_nullcrates || prob(100 - I.surplus_nullcrates))
continue
if(crate_value < I.cost)
continue
crate_value -= I.cost
new I.item(C)
/datum/supply_pack/emergency/plasma_spacesuit
name = "Plasmaman Space Envirosuits"
desc = "Contains two space-worthy envirosuits for Plasmamen. Order now and we'll throw in two free helmets! Requires EVA access to open."
-29
View File
@@ -108,17 +108,6 @@
/obj/item/clothing/gloves/color/latex/nitrile)
crate_name = "nitrile gloves crate"
/datum/supply_pack/science/nuke_b_gone
name = "Nuke Defusal Kit"
desc = "Contains set of tools to defuse a nuke."
cost = 7500 //Useful for traitors/nukies that fucked up
dangerous = TRUE
hidden = TRUE
contains = list(/obj/item/nuke_core_container/nt,
/obj/item/screwdriver/nuke/nt,
/obj/item/paper/guides/nt/nuke_instructions)
crate_name = "safe defusal kit storage"
/datum/supply_pack/science/plasma
name = "Plasma Assembly Crate"
desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
@@ -191,17 +180,6 @@
crate_name = "slime core crate"
crate_type = /obj/structure/closet/crate/secure/science
/datum/supply_pack/science/supermater
name = "Supermatter Extraction Tools Crate"
desc = "Contains a set of tools to extract a sliver of supermatter. Consult your CE today!"
cost = 7500 //Useful for traitors that fucked up
hidden = TRUE
contains = list(/obj/item/nuke_core_container/supermatter,
/obj/item/scalpel/supermatter,
/obj/item/hemostat/supermatter,
/obj/item/paper/guides/antag/supermatter_sliver)
crate_name = "supermatter extraction kit crate"
/datum/supply_pack/science/tablets
name = "Tablet Crate"
desc = "What's a computer? Contains five cargo tablets."
@@ -224,10 +202,3 @@
crate_type = /obj/structure/closet/crate/secure/science
dangerous = TRUE
/datum/supply_pack/science/tech_slugs
name = "Tech Slug Ammo Shells"
desc = "A new type of shell that is able to be made into a few different dangerous types. Contains two boxes of tech slugs, 14 shells in all."
cost = 1700
contains = list(/obj/item/storage/box/techsslug,
/obj/item/storage/box/techsslug)
crate_name = "tech slug crate"
+4
View File
@@ -14,6 +14,10 @@
var/jobbancache = null //Used to cache this client's jobbans to save on DB queries
var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
///How many messages sent in the last 10 seconds
var/total_message_count = 0
///Next tick to reset the total message counter
var/total_count_reset = 0
var/ircreplyamount = 0
/////////
+36
View File
@@ -141,7 +141,43 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
return 0
return 1
/*
* Call back proc that should be checked in all paths where a client can send messages
*
* Handles checking for duplicate messages and people sending messages too fast
*
* The first checks are if you're sending too fast, this is defined as sending
* SPAM_TRIGGER_AUTOMUTE messages in
* 5 seconds, this will start supressing your messages,
* if you send 2* that limit, you also get muted
*
* The second checks for the same duplicate message too many times and mutes
* you for it
*/
/client/proc/handle_spam_prevention(message, mute_type)
//Increment message count
total_message_count += 1
//store the total to act on even after a reset
var/cache = total_message_count
if(total_count_reset <= world.time)
total_message_count = 0
total_count_reset = world.time + (5 SECONDS)
//If they're really going crazy, mute them
if(cache >= SPAM_TRIGGER_AUTOMUTE * 2)
total_message_count = 0
total_count_reset = 0
cmd_admin_mute(src, mute_type, 1)
return 1
//Otherwise just supress the message
else if(cache >= SPAM_TRIGGER_AUTOMUTE)
return 1
if(CONFIG_GET(flag/automute_on) && !holder && last_message == message)
src.last_message_count++
if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
+1 -1
View File
@@ -273,7 +273,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
return
var/list/body = list()
body += "<html><head><title>Playtime for [key]</title></head><BODY><BR>Playtime:"
body += "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Playtime for [key]</title></head><BODY><BR>Playtime:"
body += get_exp_report()
body += "</BODY></HTML>"
usr << browse(body.Join(), "window=playerplaytime[ckey];size=550x615")
+9 -1
View File
@@ -25,7 +25,15 @@
icon_state = "sneakboots"
item_state = "sneakboots"
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = TRAIT_SILENT_STEP
/obj/item/clothing/shoes/combat/sneakboots/equipped(mob/user, slot)
. = ..()
if(slot == SLOT_SHOES)
ADD_TRAIT(user, TRAIT_SILENT_STEP, SHOES_TRAIT)
/obj/item/clothing/shoes/combat/sneakboots/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_SILENT_STEP, SHOES_TRAIT)
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT boots"
+2 -2
View File
@@ -87,10 +87,10 @@
. = ..()
if(in_range(user, src) || isobserver(user))
if( !(ishuman(user) || isobserver(user) || hasSiliconAccessInArea(user)) )
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(message)]</BODY></HTML>", "window=[name]")
user << browse("<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[stars(message)]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[message]</BODY></HTML>", "window=[name]")
user << browse("<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[message]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
. += "<span class='notice'>It is too far away.</span>"
@@ -116,3 +116,12 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("rice" = 1, "egg" = 1)
foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
/obj/item/reagent_containers/food/snacks/salad/caesar
name = "caesar salad"
desc = "You too?"
icon_state = "ceasar_salad"
trash = /obj/item/kitchen/knife
bonus_reagents = list(/datum/reagent/medicine/earthsblood = 1, /datum/reagent/iron = 4)
tastes = list("iron" = 1, "conspiracy" = 1)
foodtype = VEGETABLES
@@ -84,3 +84,13 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/validsalad
subcategory = CAT_SALAD
/datum/crafting_recipe/food/caesarsalad
name = "Caesar salad"
reqs = list(
/obj/item/kitchen/knife = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/caesar
subcategory = CAT_SALAD
-2
View File
@@ -98,8 +98,6 @@
wine_power = 35
tastes = list("thistle" = 2, "artichoke" = 1)
// Cabbage
/obj/item/seeds/cabbage
name = "pack of cabbage seeds"
@@ -149,7 +149,7 @@
var/total_complexity = return_total_complexity()
var/HTML = ""
HTML += "<html><head><title>[name]</title></head><body>"
HTML += "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[name]</title></head><body>"
HTML += "<a href='?src=[REF(src)]'>\[Refresh\]</a> | <a href='?src=[REF(src)];rename=1'>\[Rename\]</a><br>"
HTML += "[total_part_size]/[max_components] ([round((total_part_size / max_components) * 100, 0.1)]%) space taken up in the assembly.<br>"
@@ -139,7 +139,7 @@ a creative player the means to solve many problems. Circuits are held inside an
var/table_middle_width = "40%"
var/HTML = ""
HTML += "<html><head><title>[src.displayed_name]</title></head><body>"
HTML += "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[src.displayed_name]</title></head><body>"
HTML += "<div align='center'>"
HTML += "<table border='1' style='undefined;table-layout: fixed; width: 80%'>"
+2 -1
View File
@@ -95,7 +95,8 @@
<!DOCTYPE html>
<HTML>
<HEAD>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<script>
function hexify(num) {
if(!num) num = 0;
@@ -580,7 +580,7 @@
qdel(src)
/mob/dead/new_player/proc/ViewManifest()
var/dat = "<html><body>"
var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'></head><body>"
dat += "<h4>Crew Manifest</h4>"
dat += GLOB.data_core.get_manifest(OOC = 1)
+2 -1
View File
@@ -288,7 +288,8 @@
var/output = {"
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv='X-UA-Compatible' content='IE=edge' />
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<script src="jquery.min.js"></script>
<script src="jquery-ui.custom-core-widgit-mouse-sortable-min.js"></script>
<style>
@@ -380,6 +380,23 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
transfer_ckey(mind.current, FALSE)
return 1
/mob/dead/observer/verb/stay_dead()
set category = "Ghost"
set name = "Do Not Resuscitate"
if(!client)
return
if(!can_reenter_corpse)
to_chat(usr, "<span class='warning'>You're already stuck out of your body!</span>")
return FALSE
var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","Yes","No")
if(response != "Yes")
return
can_reenter_corpse = FALSE
to_chat(src, "You can no longer be brought back into your body.")
return TRUE
/mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source, flashwindow = TRUE)
if(flashwindow)
window_flash(client)
@@ -78,6 +78,7 @@
dat = {"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
<html>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
<style type=\"text/css\">
body { background-image:url('html/paigrid.png'); }
@@ -665,4 +666,4 @@
var/dat = "<h3>Sound Synthetizer</h3>"
dat += "<a href='byond://?src=[REF(src)];software=loudness;sub=1'>Open Synthesizer Interface</a><br>"
dat += "<a href='byond://?src=[REF(src)];software=loudness;sub=2'>Choose Instrument Type</a>"
return dat
return dat
+1 -1
View File
@@ -392,7 +392,7 @@
return aicamera.selectpicture(user)
/mob/living/silicon/proc/ai_roster()
var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
dat += GLOB.data_core.get_manifest()
dat += "</body></html>"
@@ -49,7 +49,7 @@
/mob/living/simple_animal/pet/bumbles/handle_automated_movement()
. = ..()
if(!isturf(loc) || !CHECK_MOBILITY(src, MOBILITY_MOVE) || buckled)
if(!isturf(loc) || buckled)
return
if(!resting && prob(1))
emote("me", EMOTE_VISIBLE, pick("curls up on the surface below ", "is looking very sleepy.", "buzzes softly ", "looks around for a flower nap "))
@@ -57,6 +57,7 @@
else if (resting && prob(1))
emote("me", EMOTE_VISIBLE, pick("wakes up with a smiling buzz.", "rolls upside down before waking up.", "stops resting."))
set_resting(FALSE)
/mob/living/simple_animal/pet/bumbles/update_mobility()
. = ..()
if(stat != DEAD)
@@ -17,9 +17,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
response_disarm = "flails at"
response_harm = "punches"
icon = 'icons/mob/guardian.dmi'
icon_state = "magicOrange"
icon_living = "magicOrange"
icon_dead = "magicOrange"
icon_state = "magicbase"
icon_living = "magicbase"
icon_dead = "magicbase"
speed = 0
blood_volume = 0
a_intent = INTENT_HARM
@@ -42,13 +42,16 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
AIStatus = AI_OFF
hud_type = /datum/hud/guardian
dextrous_hud_type = /datum/hud/dextrous/guardian //if we're set to dextrous, account for it.
var/mutable_appearance/cooloverlay
var/guardiancolor = "#ffffff"
var/recolorentiresprite
var/theme
var/list/guardian_overlays[GUARDIAN_TOTAL_LAYERS]
var/reset = 0 //if the summoner has reset the guardian already
var/cooldown = 0
var/mob/living/carbon/summoner
var/range = 13 //how far from the user the spirit can be
var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses
var/datum/guardianname/namedatum = new/datum/guardianname()
var/playstyle_string = "<span class='holoparasite bold'>You are a standard Guardian. You shouldn't exist!</span>"
var/magic_fluff_string = "<span class='holoparasite'>You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!</span>"
var/tech_fluff_string = "<span class='holoparasite'>BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!</span>"
@@ -56,7 +59,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme)
GLOB.parasites += src
setthemename(theme)
updatetheme(theme)
. = ..()
@@ -79,42 +82,36 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
GLOB.parasites -= src
return ..()
/mob/living/simple_animal/hostile/guardian/proc/setthemename(pickedtheme) //set the guardian's theme to something cool!
if(!pickedtheme)
pickedtheme = pick("magic", "tech", "carp")
var/list/possible_names = list()
switch(pickedtheme)
/mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme
if(!theme)
theme = pick("magic", "tech", "carp")
switch(theme)//should make it easier to create new stand designs in the future if anyone likes that
if("magic")
for(var/type in (subtypesof(/datum/guardianname/magic) - namedatum.type))
possible_names += new type
name = "Guardian Spirit"
real_name = "Guardian Spirit"
bubble_icon = "guardian"
icon_state = "magicbase"
icon_living = "magicbase"
icon_dead = "magicbase"
if("tech")
for(var/type in (subtypesof(/datum/guardianname/tech) - namedatum.type))
possible_names += new type
name = "Holoparasite"
real_name = "Holoparasite"
bubble_icon = "holo"
icon_state = "techbase"
icon_living = "techbase"
icon_dead = "techbase"
if("carp")
for(var/type in (subtypesof(/datum/guardianname/carp) - namedatum.type))
possible_names += new type
namedatum = pick(possible_names)
updatetheme(pickedtheme)
/mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme to whatever its datum is; proc for adminfuckery
name = "[namedatum.prefixname] [namedatum.suffixcolour]"
real_name = "[name]"
icon_living = "[namedatum.parasiteicon]"
icon_state = "[namedatum.parasiteicon]"
icon_dead = "[namedatum.parasiteicon]"
bubble_icon = "[namedatum.bubbleicon]"
if (namedatum.stainself)
add_atom_colour(namedatum.colour, FIXED_COLOUR_PRIORITY)
//Special case holocarp, because #snowflake code
if(theme == "carp")
speak_emote = list("gnashes")
desc = "A mysterious fish that stands by its charge, ever vigilant."
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
name = "Holocarp"
real_name = "Holocarp"
bubble_icon = "holo"
icon_state = "holocarp"
icon_living = "holocarp"
icon_dead = "holocarp"
speak_emote = list("gnashes")
desc = "A mysterious fish that stands by its charge, ever vigilant."
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
recolorentiresprite = TRUE
/mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in
..()
@@ -123,10 +120,37 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
if(!summoner)
to_chat(src, "<span class='holoparasite bold'>For some reason, somehow, you have no summoner. Please report this bug immediately.</span>")
return
to_chat(src, "<span class='holoparasite'>You are <font color=\"[namedatum.colour]\"><b>[real_name]</b></font>, bound to serve [summoner.real_name].</span>")
to_chat(src, "<span class='holoparasite'>You are a <b>[real_name]</b>, bound to serve [summoner.real_name].</span>")
to_chat(src, "<span class='holoparasite'>You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.p_them()] privately there.</span>")
to_chat(src, "<span class='holoparasite'>While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain yourself.</span>")
to_chat(src, playstyle_string)
guardiancustomize()
/mob/living/simple_animal/hostile/guardian/proc/guardiancustomize()
guardianrecolor()
guardianrename()
/mob/living/simple_animal/hostile/guardian/proc/guardianrecolor()
guardiancolor = input(src,"What would you like your color to be?","Choose Your Color","#ffffff") as color|null
if(!guardiancolor) //redo proc until we get a color
to_chat(src, "<span class='warning'>Not a valid color, please try again.</span>")
guardianrecolor()
return
if(!recolorentiresprite)
cooloverlay.color = guardiancolor
cut_overlay(cooloverlay) //we need to get our new color
add_overlay(cooloverlay)
else
add_atom_colour(guardiancolor, FIXED_COLOUR_PRIORITY)
/mob/living/simple_animal/hostile/guardian/proc/guardianrename()
var/new_name = sanitize_name(reject_bad_text(stripped_input(src, "What would you like your name to be?", "Choose Your Name", real_name, MAX_NAME_LEN)))
if(!new_name) //redo proc until we get a good name
to_chat(src, "<span class='warning'>Not a valid name, please try again.</span>")
guardianrename()
return
visible_message("<span class='notice'>Your new name <span class='name'>[new_name]</span> anchors itself in your mind.</span>")
fully_replace_character_name(null, new_name)
/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
. = ..()
@@ -366,7 +390,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
return
var/preliminary_message = "<span class='holoparasite bold'>[input]</span>" //apply basic color/bolding
var/my_message = "<font color=\"[namedatum.colour]\"><b><i>[src]:</i></b></font> [preliminary_message]" //add source, color source with the guardian's color
var/my_message = "<font color=\"[guardiancolor]\"><b><i>[src]:</i></b></font> [preliminary_message]" //add source, color source with the guardian's color
to_chat(summoner, my_message)
var/list/guardians = summoner.hasparasites()
@@ -393,7 +417,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/list/guardians = hasparasites()
for(var/para in guardians)
var/mob/living/simple_animal/hostile/guardian/G = para
to_chat(G, "<font color=\"[G.namedatum.colour]\"><b><i>[src]:</i></b></font> [preliminary_message]" )
to_chat(G, "<font color=\"[G.guardiancolor]\"><b><i>[src]:</i></b></font> [preliminary_message]" )
for(var/M in GLOB.dead_mob_list)
var/link = FOLLOW_LINK(M, src)
to_chat(M, "[link] [my_message]")
@@ -424,27 +448,29 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
if(guardians.len)
var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in guardians
if(G)
to_chat(src, "<span class='holoparasite'>You attempt to reset <font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font>'s personality...</span>")
to_chat(src, "<span class='holoparasite'>You attempt to reset <font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font>'s personality...</span>")
var/list/mob/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
if(LAZYLEN(candidates))
var/mob/C = pick(candidates)
to_chat(G, "<span class='holoparasite'>Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.</span>")
to_chat(src, "<span class='holoparasite bold'>Your <font color=\"[G.namedatum.colour]\">[G.real_name]</font> has been successfully reset.</span>")
to_chat(src, "<span class='holoparasite bold'>Your <font color=\"[G.guardiancolor]\">[G.real_name]</font> has been successfully reset.</span>")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(G)])")
G.ghostize(FALSE)
G.setthemename(G.namedatum.theme) //give it a new color, to show it's a new person
G.guardiancustomize() //give it a new color, to show it's a new person
C.transfer_ckey(G)
G.reset = 1
switch(G.namedatum.theme)
switch(G.theme)
if("tech")
to_chat(src, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> is now online!</span>")
to_chat(src, "<span class='holoparasite'><font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font> is now online!</span>")
if("magic")
to_chat(src, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> has been summoned!</span>")
to_chat(src, "<span class='holoparasite'><font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font> has been summoned!</span>")
if("carp")
to_chat(src, "<span class='holoparasite'><font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font> has been caught!</span>")
guardians -= G
if(!guardians.len)
verbs -= /mob/living/proc/guardian_reset
else
to_chat(src, "<span class='holoparasite'>There were no ghosts willing to take control of <font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font>. Looks like you're stuck with it for now.</span>")
to_chat(src, "<span class='holoparasite'>There were no ghosts willing to take control of <font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font>. Looks like you're stuck with it for now.</span>")
else
to_chat(src, "<span class='holoparasite'>You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].</span>")
else
@@ -558,6 +584,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
used = FALSE
return
var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, theme)
G.name = mob_name
G.summoner = user
G.key = key
G.mind.enslave_mind_to_creator(user)
@@ -565,13 +592,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
switch(theme)
if("tech")
to_chat(user, "[G.tech_fluff_string]")
to_chat(user, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> is now online!</span>")
to_chat(user, "<span class='holoparasite'><b>[G.real_name]</b> is now online!</span>")
if("magic")
to_chat(user, "[G.magic_fluff_string]")
to_chat(user, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> has been summoned!</span>")
to_chat(user, "<span class='holoparasite'><b>[G.real_name]</b> has been summoned!</span>")
if("carp")
to_chat(user, "[G.carp_fluff_string]")
to_chat(user, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> has been caught!</span>")
to_chat(user, "<span class='holoparasite'><b>[G.real_name]</b> has been caught!</span>")
user.verbs += /mob/living/proc/guardian_comm
user.verbs += /mob/living/proc/guardian_recall
user.verbs += /mob/living/proc/guardian_reset
@@ -600,6 +627,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/obj/item/guardiancreator/tech/choose/traitor
possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
allowling = FALSE
/obj/item/guardiancreator/tech/choose/traitor/check_uplink_validity()
return !used
@@ -683,8 +711,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
failure_message = "<span class='holoparasite bold'>You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up.</span>"
ling_failure = "<span class='holoparasite bold'>Carp'sie is fine with changelings, so you shouldn't be seeing this message.</span>"
allowmultiple = TRUE
allowling = TRUE
random = TRUE
/obj/item/guardiancreator/carp/choose
random = FALSE
@@ -1,161 +0,0 @@
/datum/guardianname
var/prefixname = "Default" //the prefix the guardian uses for its name
var/suffixcolour = "Name" //the suffix the guardian uses for its name
var/parasiteicon = "techbase" //the icon of the guardian
var/bubbleicon = "holo" //the speechbubble icon of the guardian
var/theme = "tech" //what the actual theme of the guardian is
var/colour = "#C3C3C3" //what color the guardian's name is in chat and what color is used for effects from the guardian
var/stainself = 0 //whether to use the color var to literally dye ourself our chosen colour, for lazy spriting
/datum/guardianname/carp
bubbleicon = "guardian"
theme = "carp"
parasiteicon = "holocarp"
stainself = 1
/datum/guardianname/carp/New()
prefixname = pick(GLOB.carp_names)
/datum/guardianname/carp/sand
suffixcolour = "Sand"
colour = "#C2B280"
/datum/guardianname/carp/seashell
suffixcolour = "Seashell"
colour = "#FFF5EE"
/datum/guardianname/carp/coral
suffixcolour = "Coral"
colour = "#FF7F50"
/datum/guardianname/carp/salmon
suffixcolour = "Salmon"
colour = "#FA8072"
/datum/guardianname/carp/sunset
suffixcolour = "Sunset"
colour = "#FAD6A5"
/datum/guardianname/carp/riptide
suffixcolour = "Riptide"
colour = "#89D9C8"
/datum/guardianname/carp/seagreen
suffixcolour = "Sea Green"
colour = "#2E8B57"
/datum/guardianname/carp/ultramarine
suffixcolour = "Ultramarine"
colour = "#3F00FF"
/datum/guardianname/carp/cerulean
suffixcolour = "Cerulean"
colour = "#007BA7"
/datum/guardianname/carp/aqua
suffixcolour = "Aqua"
colour = "#00FFFF"
/datum/guardianname/carp/paleaqua
suffixcolour = "Pale Aqua"
colour = "#BCD4E6"
/datum/guardianname/carp/hookergreen
suffixcolour = "Hooker Green"
colour = "#49796B"
/datum/guardianname/magic
bubbleicon = "guardian"
theme = "magic"
/datum/guardianname/magic/New()
prefixname = pick("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces", "Ophiuchus")
/datum/guardianname/magic/red
suffixcolour = "Red"
parasiteicon = "magicRed"
colour = "#E32114"
/datum/guardianname/magic/pink
suffixcolour = "Pink"
parasiteicon = "magicPink"
colour = "#FB5F9B"
/datum/guardianname/magic/orange
suffixcolour = "Orange"
parasiteicon = "magicOrange"
colour = "#F3CF24"
/datum/guardianname/magic/green
suffixcolour = "Green"
parasiteicon = "magicGreen"
colour = "#A4E836"
/datum/guardianname/magic/blue
suffixcolour = "Blue"
parasiteicon = "magicBlue"
colour = "#78C4DB"
/datum/guardianname/tech/New()
prefixname = pick("Gallium", "Indium", "Thallium", "Bismuth", "Aluminium", "Mercury", "Iron", "Silver", "Zinc", "Titanium", "Chromium", "Nickel", "Platinum", "Tellurium", "Palladium", "Rhodium", "Cobalt", "Osmium", "Tungsten", "Iridium")
/datum/guardianname/tech/rose
suffixcolour = "Rose"
parasiteicon = "techRose"
colour = "#F62C6B"
/datum/guardianname/tech/peony
suffixcolour = "Peony"
parasiteicon = "techPeony"
colour = "#E54750"
/datum/guardianname/tech/lily
suffixcolour = "Lily"
parasiteicon = "techLily"
colour = "#F6562C"
/datum/guardianname/tech/daisy
suffixcolour = "Daisy"
parasiteicon = "techDaisy"
colour = "#ECCD39"
/datum/guardianname/tech/zinnia
suffixcolour = "Zinnia"
parasiteicon = "techZinnia"
colour = "#89F62C"
/datum/guardianname/tech/ivy
suffixcolour = "Ivy"
parasiteicon = "techIvy"
colour = "#5DF62C"
/datum/guardianname/tech/iris
suffixcolour = "Iris"
parasiteicon = "techIris"
colour = "#2CF6B8"
/datum/guardianname/tech/petunia
suffixcolour = "Petunia"
parasiteicon = "techPetunia"
colour = "#51A9D4"
/datum/guardianname/tech/violet
suffixcolour = "Violet"
parasiteicon = "techViolet"
colour = "#8A347C"
/datum/guardianname/tech/lotus
suffixcolour = "Lotus"
parasiteicon = "techLotus"
colour = "#463546"
/datum/guardianname/tech/lilac
suffixcolour = "Lilac"
parasiteicon = "techLilac"
colour = "#C7A0F6"
/datum/guardianname/tech/orchid
suffixcolour = "Orchid"
parasiteicon = "techOrchid"
colour = "#F62CF5"
@@ -77,7 +77,7 @@
user.ex_act(EXPLODE_HEAVY)
qdel(src)
else
to_chat(user, "<span class='holoparasite'>[src] glows with a strange <font color=\"[spawner.namedatum.colour]\">light</font>, and you don't touch it.</span>")
to_chat(user, "<span class='holoparasite'>[src] glows with a strange <font color=\"[spawner.guardiancolor]\">light</font>, and you don't touch it.</span>")
/obj/guardian_bomb/Bump(atom/A)
detonate(A)
@@ -93,4 +93,4 @@
/obj/guardian_bomb/examine(mob/user)
. = stored_obj.examine(user)
if(get_dist(user,src)<=2)
. += "<span class='holoparasite'>It glows with a strange <font color=\"[spawner.namedatum.colour]\">light</font>!</span>"
. += "<span class='holoparasite'>It glows with a strange <font color=\"[spawner.guardiancolor]\">light</font>!</span>"
@@ -21,8 +21,8 @@
. = ..()
if(. > 0 && toggle)
var/image/I = new('icons/effects/effects.dmi', src, "shield-flash", MOB_LAYER+0.01, dir = pick(GLOB.cardinals))
if(namedatum)
I.color = namedatum.colour
if(guardiancolor)
I.color = guardiancolor
flick_overlay_view(I, src, 5)
/mob/living/simple_animal/hostile/guardian/protector/ToggleMode()
@@ -39,8 +39,8 @@
toggle = FALSE
else
var/mutable_appearance/shield_overlay = mutable_appearance('icons/effects/effects.dmi', "shield-grey")
if(namedatum)
shield_overlay.color = namedatum.colour
if(guardiancolor)
shield_overlay.color = guardiancolor
add_overlay(shield_overlay)
melee_damage_lower = 5
melee_damage_upper = 5
@@ -59,7 +59,7 @@
visible_message("<span class='danger'>\The [src] jumps back to its user.</span>")
Recall(TRUE)
else
to_chat(summoner, "<span class='holoparasite'>You moved out of range, and were pulled back! You can only move [range] meters from <font color=\"[namedatum.colour]\"><b>[real_name]</b></font>!</span>")
to_chat(summoner, "<span class='holoparasite'>You moved out of range, and were pulled back! You can only move [range] meters from <font color=\"[guardiancolor]\"><b>[real_name]</b></font>!</span>")
summoner.visible_message("<span class='danger'>\The [summoner] jumps back to [summoner.p_their()] protector.</span>")
new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner))
summoner.forceMove(get_turf(src))
@@ -55,8 +55,8 @@
. = ..()
if(istype(., /obj/item/projectile))
var/obj/item/projectile/P = .
if(namedatum)
P.color = namedatum.colour
if(guardiancolor)
P.color = guardiancolor
/mob/living/simple_animal/hostile/guardian/ranged/ToggleLight()
var/msg
@@ -32,8 +32,8 @@
C.adjustOxyLoss(-5)
C.adjustToxLoss(-5, forced = TRUE)
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
if(namedatum)
H.color = namedatum.colour
if(guardiancolor)
H.color = guardiancolor
if(C == summoner)
update_health_hud()
med_hud_set_health()
@@ -96,8 +96,8 @@
/obj/structure/receiving_pad/New(loc, mob/living/simple_animal/hostile/guardian/healer/G)
. = ..()
if(G.namedatum)
add_atom_colour(G.namedatum.colour, FIXED_COLOUR_PRIORITY)
if(G.guardiancolor)
add_atom_colour(G.guardiancolor, FIXED_COLOUR_PRIORITY)
/obj/structure/receiving_pad/proc/disappear()
visible_message("[src] vanishes!")
+2 -2
View File
@@ -15,8 +15,8 @@
/obj/item/clothing/shoes/space_ninja/equipped(mob/user, slot)
. = ..()
if(slot == SLOT_SHOES)
ADD_TRAIT(user, TRAIT_SILENT_STEP, "ninja_shoes_[REF(src)]")
ADD_TRAIT(user, TRAIT_SILENT_STEP, SHOES_TRAIT)
/obj/item/clothing/shoes/space_ninja/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_SILENT_STEP, "ninja_shoes_[REF(src)]")
REMOVE_TRAIT(user, TRAIT_SILENT_STEP, SHOES_TRAIT)
+1 -1
View File
@@ -80,7 +80,7 @@
var/obj/item/P = contents[i]
dat += "<tr><td><a href='?src=[REF(src)];retrieve=[REF(P)]'>[P.name]</a></td></tr>"
dat += "</table></center>"
user << browse("<html><head><title>[name]</title></head><body>[dat]</body></html>", "window=filingcabinet;size=350x300")
user << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[name]</title></head><body>[dat]</body></html>", "window=filingcabinet;size=350x300")
/obj/structure/filingcabinet/attack_tk(mob/user)
if(anchored)
+4 -4
View File
@@ -62,11 +62,11 @@
/obj/item/paper/oui_getcontent(mob/target)
if(!target.is_literate() || force_stars)
force_stars = FALSE
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
return "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
else if(istype(target.get_active_held_item(), /obj/item/pen) | istype(target.get_active_held_item(), /obj/item/toy/crayon))
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>"
return "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>"
else
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>"
return "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>"
/obj/item/paper/oui_canview(mob/target)
if(check_rights_for(target.client, R_FUN)) //Allows admins to view faxes
@@ -231,7 +231,7 @@
/obj/item/paper/proc/openhelp(mob/user)
user << browse({"<HTML><HEAD><TITLE>Paper Help</TITLE></HEAD>
user << browse({"<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>Paper Help</TITLE></HEAD>
<BODY>
You can use backslash (\\) to escape special characters.<br>
<br>
+1 -1
View File
@@ -72,7 +72,7 @@
to_chat(user, "<span class='warning'>[src] seems to be blank...</span>")
return
user << browse_rsc(picture.picture_image, "tmp_photo.png")
user << browse("<html><head><title>[name]</title></head>" \
user << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>[name]</title></head>" \
+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
+ "<img src='tmp_photo.png' width='480' style='-ms-interpolation-mode:nearest-neighbor' />" \
+ "[scribble ? "<br>Written on the back:<br><i>[scribble]</i>" : ""]"\
@@ -95,7 +95,7 @@
name = "scatter laser shell"
desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a scatter laser weapon in a ballistic package."
icon_state = "lshell"
projectile_type = /obj/item/projectile/beam/weak
projectile_type = /obj/item/projectile/beam/scatter
pellets = 6
variance = 35
@@ -130,12 +130,16 @@
ENABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
/obj/item/ammo_casing/shotgun/dart/bioterror
desc = "A shotgun dart filled with deadly toxins."
desc = "A shotgun dart filled with an obscene amount of lethal reagents. God help whoever is shot with this."
projectile_type = /obj/item/projectile/bullet/dart/piercing
reagent_amount = 50
/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
. = ..()
reagents.add_reagent(/datum/reagent/toxin/fentanyl, 6)
reagents.add_reagent(/datum/reagent/toxin/spore, 6)
reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 6) //;HELP OPS IN MAINT
reagents.add_reagent(/datum/reagent/toxin/coniine, 6)
reagents.add_reagent(/datum/reagent/toxin/sodium_thiopental, 6)
reagents.add_reagent(/datum/reagent/toxin/amanitin, 12) //for a nasty surprise after you get shot and somehow escape and don't think to quickly purge, and even shock those who are loaded up on purging agents
reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 6)
reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 6) //;HELPIES OPS IN MAINT
reagents.add_reagent(/datum/reagent/impedrezene, 6)
reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 5) //this and the acid equal about 25ish burn, not counting the minute toxin damage dealt by their metabolism, this makes each dart about as lethal as a stechkin shot in upfront damage
reagents.add_reagent(/datum/reagent/toxin/acid, 5)
reagents.add_reagent(/datum/reagent/consumable/frostoil, 10) //tempgun slowdown goes both ways and adds to the burn
@@ -273,7 +273,7 @@
icon_state = "dshotgun"
item_state = "shotgun"
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
weapon_weight = WEAPON_MEDIUM
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
+1 -1
View File
@@ -50,7 +50,7 @@
/obj/item/projectile/beam/scatter
name = "laser pellet"
icon_state = "scatterlaser"
damage = 5
damage = 12.5
/obj/item/projectile/beam/xray
name = "\improper X-ray beam"
@@ -29,6 +29,9 @@
reagents.handle_reactions()
return BULLET_ACT_HIT
/obj/item/projectile/bullet/dart/piercing
piercing = TRUE
/obj/item/projectile/bullet/dart/metalfoam/Initialize()
. = ..()
reagents.add_reagent(/datum/reagent/aluminium, 15)
@@ -18,13 +18,28 @@
/obj/item/projectile/bullet/shotgun_stunslug
name = "stunslug"
damage = 5
stamina = 20
knockdown = 100
stamina = 30
stutter = 5
jitter = 20
range = 7
icon_state = "spark"
color = "#FFFF00"
var/tase_duration = 50
/obj/item/projectile/bullet/shotgun_stunslug/on_hit(atom/target, blocked = FALSE)
. = ..()
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks!
do_sparks(1, TRUE, src)
if(iscarbon(target))
var/mob/living/carbon/C = target
SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "tased", /datum/mood_event/tased)
SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
C.IgniteMob()
if(C.dna && C.dna.check_mutation(HULK))
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
else if(tase_duration && (C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE) && !HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
C.electrocute_act(15, src, 1, SHOCK_NOSTUN)
C.apply_status_effect(STATUS_EFFECT_TASED_WEAK, tase_duration)
/obj/item/projectile/bullet/shotgun_meteorslug
name = "meteorslug"
@@ -93,7 +108,6 @@
/obj/item/projectile/bullet/scattershot
damage = 20
stamina = 65
/obj/item/projectile/bullet/seed
damage = 4
-6
View File
@@ -65,7 +65,6 @@
var/refund_amount = 0 // specified refund amount in case there needs to be a TC penalty for refunds.
var/refundable = FALSE
var/surplus = 100 // Chance of being included in the surplus crate.
var/surplus_nullcrates //Chance of being included in null crates. null = pull from surplus
var/cant_discount = FALSE
var/limited_stock = -1 //Setting this above zero limits how many times this item can be bought by the same traitor in a round, -1 is unlimited
var/list/include_modes = list() // Game modes to allow this item in.
@@ -76,11 +75,6 @@
var/restricted = FALSE // Adds restrictions for VR/Events
var/illegal_tech = TRUE // Can this item be deconstructed to unlock certain techweb research nodes?
/datum/uplink_item/New()
. = ..()
if(isnull(surplus_nullcrates))
surplus_nullcrates = surplus
/datum/uplink_item/proc/get_discount()
return pick(4;0.75,2;0.5,1;0.25)
@@ -56,6 +56,13 @@
item = /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun
cost = 12
/datum/uplink_item/ammo/shotgun/bioterror
name = "12g Bioterror Dart Drum"
desc = "An additional 8-round bioterror dart magazine for use with the Bulldog shotgun. \
Pierces armor and injects are horrid cocktail of death into your target. Be careful about friendly fire."
cost = 6 //legacy price
item = /obj/item/ammo_box/magazine/m12g/bioterror
/datum/uplink_item/ammo/shotgun/buck
name = "12g Buckshot Drum"
desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
@@ -66,20 +73,12 @@
desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
'I'm a fire starter, twisted fire starter!'"
item = /obj/item/ammo_box/magazine/m12g/dragon
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/meteor
name = "12g Meteorslug Shells"
desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
Great for blasting airlocks off their frames and knocking down enemies."
item = /obj/item/ammo_box/magazine/m12g/meteor
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/scatter
name = "12g Scatter Laser shot Slugs"
desc = "An alternative 8-round Scatter Laser Shot magazine for use in the Bulldog shotgun."
item = /obj/item/ammo_box/magazine/m12g/scatter
cost = 4 // most armor has less laser protection then bullet
/datum/uplink_item/ammo/shotgun/slug
name = "12g Slug Drum"
@@ -93,7 +92,6 @@
desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \
Saying that they're completely non-lethal would be lying."
item = /obj/item/ammo_box/magazine/m12g/stun
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/revolver
name = ".357 Speed Loader"
+5 -1
View File
@@ -2,4 +2,8 @@
## List of job titles followed by dynamic threat value, all prefixed with JOB_THREAT. See code/modules/jobs/job_types for titles
## e.g.
## JOB_THREAT Captain 5
## JOB_THREAT Assistant 0.2
## JOB_THREAT Assistant 0.2
## Custom antag threat values, see above
## e.g.
## ANTAG_THREAT Traitor 5
@@ -0,0 +1,5 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- balance: "White Ships, Telerelays and a defunk mining post are now always going to spawn."
- spellcheck: "Corrects a few desc on station side ruins"
@@ -0,0 +1,11 @@
author: "KathrinBailey"
delete-after: True
changes:
- rscadd: "Radiation shuttesr to all supermatters."
- rscadd: "Windowed shutters to armouries where relevant."
- rscadd: "New posters are now on the map in relevant locations."
- bugfix: "Windowed shutter now has glass, the door closing proc sees this and no longer changes opacity."
- bugfix: "Accidental HoochMaster removal in the bar."
- bugfix: "Spawning looking at the supermatter with no mesons on Meta."
- bugfix: "Missing disposal pipe outside HoP office."
- bugfix: "Sofas were never adjusted when the pool was added."
@@ -0,0 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- rscadd: "Medical Mechs syringe gun now knows many more life saving chems, like Insulin, Dexalin, Prussian Blue, Kelotane and Bicaridine"
@@ -0,0 +1,6 @@
author: "Putnam3145"
delete-after: True
changes:
- config: "Added configs for various antag threat levels."
- bugfix: "Fixed a runtime in threat calculation."
- tweak: "Fixed up some misleading texts."
@@ -0,0 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- rscadd: "Cooks aided by Clowns have came out with and new healthy Salad - Caesar Salad. Just dont eat the knife..."
@@ -0,0 +1,4 @@
author: "Ghommie"
delete-after: True
changes:
- bugfix: "Infiltrator's boots don't stop slips and \"space wind\" through the power of runtime errors anymore, and properly silence the user's footsteps now."
@@ -0,0 +1,4 @@
author: "zeroisthebiggay"
delete-after: True
changes:
- rscadd: "ghosts can now DNR"
@@ -0,0 +1,5 @@
author: "zeroisthebiggay"
delete-after: True
changes:
- rscadd: "You can now choose your name and color as a holoparasite/guardian/holocarp!"
- bugfix: "fixes lings being able to get mechanical holoparasites"
@@ -0,0 +1,4 @@
author: "Xantholne"
delete-after: True
changes:
- bugfix: "bumbles will stop sleeping so much"

Some files were not shown because too many files have changed in this diff Show More