helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210)

* .

* .
This commit is contained in:
zeroisthebiggay
2021-09-27 11:49:01 -04:00
committed by GitHub
parent 1992bf7cfb
commit 41169d4366
+195 -135
View File
@@ -875,7 +875,8 @@
/area/service/cafeteria)
"cj" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/clothing/suit/space/syndicate/orange,
/obj/item/clothing/suit/space/syndicate/green/dark,
/obj/item/clothing/head/helmet/space/syndicate/green/dark,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"ck" = (
@@ -1366,6 +1367,9 @@
dir = 1;
icon_state = "trimline_fill"
},
/mob/living/simple_animal/hostile/syndicate/melee/sword/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/skelter/nav)
"ds" = (
@@ -1895,6 +1899,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/clothing/head/helmet/space/syndicate/blue,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"eC" = (
@@ -2483,6 +2488,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/clothing/head/helmet/space/syndicate,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"fR" = (
@@ -2581,6 +2587,7 @@
/obj/item/clothing/suit/space/syndicate/orange{
desc = "Wait, don't these normally come with a helmet?"
},
/obj/item/clothing/head/helmet/space/syndicate/orange,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/forehall)
"gg" = (
@@ -2726,6 +2733,7 @@
dir = 1;
pixel_y = -24
},
/obj/item/clothing/head/helmet/space/syndicate/green,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"gx" = (
@@ -2823,6 +2831,10 @@
/area/ruin/space/has_grav/skelter/engine/lower)
"gH" = (
/obj/structure/rack,
/obj/item/dnainjector/tonguespike{
desc = "It's a little suspicious.";
name = "suspicious serum"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"gI" = (
@@ -2907,18 +2919,18 @@
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/skelter/shields)
"gT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8;
icon_state = "scrub_map_on-2"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = null;
dir = 1;
name = "Shield Room APC";
pixel_y = 23
},
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8
},
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/skelter/shields)
"gU" = (
@@ -3136,7 +3148,9 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/turf/open/floor/mineral/titanium/white,
/turf/open/floor/plating/airless{
icon_state = "platingdmg1"
},
/area/ruin/space/has_grav/skelter/shields)
"hp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -3325,7 +3339,9 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/mineral/titanium/white,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
/area/ruin/space/has_grav/skelter/shields)
"hO" = (
/obj/machinery/shieldgen,
@@ -3523,18 +3539,20 @@
/turf/open/floor/circuit,
/area/ruin/space/has_grav/skelter/shields)
"il" = (
/turf/open/floor/mineral/titanium/white,
/obj/structure/lattice,
/turf/open/space/basic,
/area/ruin/space/has_grav/skelter/shields)
"im" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/machinery/light,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
/turf/open/floor/mineral/titanium/white,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1
},
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
/area/ruin/space/has_grav/skelter/shields)
"in" = (
/turf/open/floor/plasteel{
@@ -3722,10 +3740,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/item/uplink/old{
pixel_x = -4;
pixel_y = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4;
icon_state = "scrub_map_on-2"
@@ -3839,7 +3853,10 @@
/area/ruin/space/has_grav/skelter/comms)
"iP" = (
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/book/granter/martial/cqc{
name = "dusty manual";
used = 1
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"iQ" = (
@@ -3874,20 +3891,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/storage)
"iU" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/machinery/telecomms/relay/preset/auto,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iV" = (
/obj/structure/chair/comfy/teal,
/obj/effect/turf_decal/tile/blue,
@@ -3917,6 +3920,7 @@
/obj/item/clothing/suit/space/syndicate/black{
desc = "Wait, don't these normally come with a helmet?"
},
/obj/item/clothing/head/helmet/space/syndicate/black,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iX" = (
@@ -4078,7 +4082,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/machinery/telecomms/allinone,
/mob/living/simple_animal/hostile/syndicate/melee/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"jo" = (
@@ -4146,12 +4152,6 @@
/obj/item/gun/ballistic/automatic/pistol/no_mag,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"jw" = (
/turf/open/space/basic,
/area/space/nearstation)
"jx" = (
/turf/open/space/basic,
/area/template_noop)
"jy" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -4166,6 +4166,66 @@
/obj/item/ammo_casing/c10mm,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"sg" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/skelter/shields)
"vv" = (
/mob/living/simple_animal/hostile/syndicate/melee/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"vz" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular"
},
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
/area/ruin/space/has_grav/skelter/shields)
"AJ" = (
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav/skelter/shields)
"AR" = (
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"JR" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
/area/ruin/space/has_grav/skelter/shields)
"Li" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/lattice,
/turf/open/space/basic,
/area/ruin/space/has_grav/skelter/shields)
"OA" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular"
},
/turf/template_noop,
/area/template_noop)
"WM" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
"Zs" = (
/obj/item/shard{
icon_state = "medium"
},
/obj/structure/fluff/broken_flooring{
dir = 8;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
ah
@@ -4483,7 +4543,7 @@ cF
cF
ex
eW
cF
AR
fN
gj
hJ
@@ -4525,7 +4585,7 @@ iI
iQ
iY
ji
jx
ah
"}
(13,1,1) = {"
ah
@@ -4549,7 +4609,7 @@ gj
iP
gl
hx
hx
vv
is
hx
eA
@@ -4705,7 +4765,7 @@ fV
hX
jb
jj
jw
ah
"}
(19,1,1) = {"
ah
@@ -4885,7 +4945,7 @@ gO
iT
jf
jk
jw
ah
"}
(25,1,1) = {"
ay
@@ -4942,7 +5002,7 @@ hH
ih
iG
iN
iU
iO
ii
jl
ah
@@ -5091,10 +5151,10 @@ hn
hM
ik
iH
gA
bx
ae
ah
gz
bL
bL
ak
ah
"}
(32,1,1) = {"
@@ -5118,13 +5178,13 @@ ga
gx
gR
ho
hM
Li
vz
il
il
gA
ae
ah
ah
sg
bL
ak
ak
ah
"}
(33,1,1) = {"
@@ -5150,12 +5210,12 @@ gS
hp
hN
im
gA
gU
ah
ah
ah
ah
sg
JR
ac
ak
ak
bq
"}
(34,1,1) = {"
ah
@@ -5179,13 +5239,13 @@ gz
gT
hq
hO
gA
gU
ah
ah
ah
ah
ah
gz
sg
WM
ac
ak
ak
cl
"}
(35,1,1) = {"
aS
@@ -5207,15 +5267,15 @@ dV
gd
gA
gU
gU
gU
gU
ah
ah
ah
ah
ah
ah
gz
AJ
gz
ac
ac
ac
ac
ak
aZ
"}
(36,1,1) = {"
ah
@@ -5237,15 +5297,15 @@ fI
ge
gB
gV
jw
ah
ah
ah
ah
ah
ah
ah
ah
aZ
ac
ak
ak
ac
ac
ac
ac
aZ
"}
(37,1,1) = {"
ah
@@ -5267,15 +5327,15 @@ cR
gf
ct
cR
ah
ah
ah
ah
ah
ah
ah
ah
ah
aZ
ak
ak
ak
ak
ac
ac
ac
Zs
"}
(38,1,1) = {"
ah
@@ -5296,16 +5356,16 @@ bx
dV
ct
ct
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
aZ
aZ
ac
ak
ak
ak
ak
ak
ac
aZ
"}
(39,1,1) = {"
ah
@@ -5326,16 +5386,16 @@ cu
cb
ae
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
OA
cl
do
ac
ak
ak
ak
ac
aZ
aS
"}
(40,1,1) = {"
ah
@@ -5356,15 +5416,15 @@ fr
cc
ah
ah
do
aS
bq
ah
aZ
aZ
ah
ah
ah
ah
ah
ah
ah
ah
aZ
aS
ah
"}
(41,1,1) = {"
@@ -5387,13 +5447,13 @@ cc
ah
ah
ah
aZ
do
ah
ah
ah
ah
ah
ah
ah
do
aZ
ba
ah
ah
"}
@@ -5419,12 +5479,12 @@ ah
ah
ah
ah
bF
ah
ah
ah
ah
ah
ah
aZ
ah
"}
(43,1,1) = {"
@@ -5445,15 +5505,15 @@ ce
ce
ce
ah
aZ
cl
ah
ah
ah
aZ
aS
ah
ah
ah
ah
ah
ah
cl
ah
ah
"}
@@ -5476,7 +5536,7 @@ ah
ah
ah
ah
ah
bq
ah
ah
ah