mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
I missed some stuff on suppression removal (#5939)
## About The Pull Request title ## Why It's Good For The Game title ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 del: suppression system stuff I missed in the last PR /🆑
This commit is contained in:
@@ -66,14 +66,6 @@ required_map = "birdshot.dmm"
|
||||
coordinates = [111, 157, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Birdshot Supermatter Chamber
|
||||
[templates.birdshot_supermatter]
|
||||
map_files = ["birdshot_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/Birdshot/"
|
||||
required_map = "birdshot.dmm"
|
||||
coordinates = [71, 211, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Birdshot Vacant Room (to replace the mapped barber with ours)
|
||||
[templates.birdshot_vacant]
|
||||
map_files = ["birdshot_vacant.dmm"]
|
||||
@@ -156,14 +148,6 @@ required_map = "CatwalkStation_2023.dmm"
|
||||
coordinates = [153, 173, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Catwalk Supermatter Chamber
|
||||
[templates.catwalk_supermatter]
|
||||
map_files = ["catwalk_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/CatwalkStation/"
|
||||
required_map = "CatwalkStation_2023.dmm"
|
||||
coordinates = [172, 163, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Catwalk Showroom
|
||||
[templates.catwalk_showroom]
|
||||
map_files = ["catwalk_showroom.dmm"]
|
||||
@@ -254,14 +238,6 @@ required_map = "DeltaStation2.dmm"
|
||||
coordinates = [123, 143, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Deltastation Supermatter Chamber
|
||||
[templates.deltastation_supermatter]
|
||||
map_files = ["deltastation_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/Deltastation/"
|
||||
required_map = "DeltaStation2.dmm"
|
||||
coordinates = [84, 109, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# ICEBOXSTATION MAP EDITS
|
||||
# IceBoxStation Aux Tool Storage
|
||||
[templates.iceboxstation_aux_toolstorage]
|
||||
@@ -351,14 +327,6 @@ required_map = "IceBoxStation.dmm"
|
||||
coordinates = [84, 128, 3]
|
||||
trait_name = "Station"
|
||||
|
||||
# IceBoxStation Supermatter Chamber
|
||||
[templates.iceboxstation_supermatter]
|
||||
map_files = ["iceboxstation_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/IceBoxStation/"
|
||||
required_map = "IceBoxStation.dmm"
|
||||
coordinates = [114, 65, 3]
|
||||
trait_name = "Station"
|
||||
|
||||
# IceBoxStation SW Persistence
|
||||
[templates.iceboxstation_persistence]
|
||||
map_files = ["iceboxstation_persistence.dmm"]
|
||||
@@ -474,14 +442,6 @@ required_map = "MetaStation.dmm"
|
||||
coordinates = [101, 115, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Metastation Supermatter Chamber
|
||||
[templates.metastation_supermatter]
|
||||
map_files = ["metastation_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/MetaStation/"
|
||||
required_map = "MetaStation.dmm"
|
||||
coordinates = [163, 155, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# MOONSTATION MAP EDITS
|
||||
# Moonstation Ashwalker nest
|
||||
[templates.moonstation_ashwalker_nest]
|
||||
@@ -637,14 +597,6 @@ required_map = "tramstation.dmm"
|
||||
coordinates = [34, 135, 2]
|
||||
trait_name = "Station"
|
||||
|
||||
# Tramstation Supermatter Chamber
|
||||
[templates.tramstation_supermatter]
|
||||
map_files = ["tramstation_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/tramstation/"
|
||||
required_map = "tramstation.dmm"
|
||||
coordinates = [118, 75, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# VOIDRAPTOR MAP EDITS
|
||||
# VoidRaptor Book of Kindred
|
||||
[templates.voidraptor_book_of_kindred]
|
||||
@@ -726,11 +678,3 @@ directory = "_maps/bubber/automapper/templates/wawastation/"
|
||||
required_map = "wawastation.dmm"
|
||||
coordinates = [108, 122, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# Wawastation Supermatter
|
||||
[templates.wawastation_supermatter]
|
||||
map_files = ["wawastation_supermatter.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/wawastation/"
|
||||
required_map = "wawastation.dmm"
|
||||
coordinates = [162, 63, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"d" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"U" = (
|
||||
/obj/structure/sign/delam_procedure,
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"W" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
W
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
a
|
||||
d
|
||||
a
|
||||
a
|
||||
U
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
@@ -1,30 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"b" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"z" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/engine)
|
||||
"D" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"O" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
|
||||
(1,1,1) = {"
|
||||
O
|
||||
b
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
z
|
||||
b
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
b
|
||||
b
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
b
|
||||
D
|
||||
"}
|
||||
@@ -1,86 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"i" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"j" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"l" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"t" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"M" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
|
||||
/obj/machinery/meter,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/supermatter/room)
|
||||
|
||||
(1,1,1) = {"
|
||||
t
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
M
|
||||
j
|
||||
a
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
i
|
||||
l
|
||||
i
|
||||
"}
|
||||
(7,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
@@ -1,113 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"c" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"i" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"n" = (
|
||||
/obj/effect/spawner/structure/window/reinforced/plasma,
|
||||
/turf/template_noop,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"p" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"s" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"y" = (
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"H" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/clothing/suit/utility/radiation,
|
||||
/obj/item/clothing/head/utility/radiation,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/geiger_counter,
|
||||
/obj/item/clothing/glasses/meson,
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
p
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
i
|
||||
c
|
||||
y
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
a
|
||||
s
|
||||
H
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
a
|
||||
n
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
@@ -1,86 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"h" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"x" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/main)
|
||||
"C" = (
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"R" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"V" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
|
||||
(1,1,1) = {"
|
||||
x
|
||||
h
|
||||
C
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
a
|
||||
R
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
V
|
||||
"}
|
||||
@@ -1,78 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"k" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"l" = (
|
||||
/obj/machinery/power/apc/auto_name/directional/east,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/main)
|
||||
"m" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/clothing/head/utility/radiation,
|
||||
/obj/item/clothing/glasses/meson,
|
||||
/obj/item/geiger_counter,
|
||||
/obj/item/geiger_counter,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"q" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"D" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"E" = (
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
|
||||
(1,1,1) = {"
|
||||
a
|
||||
a
|
||||
m
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
a
|
||||
k
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
D
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
l
|
||||
q
|
||||
E
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
@@ -1,130 +0,0 @@
|
||||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
|
||||
"a" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"t" = (
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/engine,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"z" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"H" = (
|
||||
/turf/open/floor/iron,
|
||||
/area/station/engineering/main)
|
||||
"N" = (
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
"Y" = (
|
||||
/obj/structure/sign/delam_procedure,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/engineering/supermatter/room)
|
||||
|
||||
(1,1,1) = {"
|
||||
H
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(2,1,1) = {"
|
||||
z
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
Y
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
t
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(4,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(6,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(7,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(8,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(10,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(11,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
N
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
(12,1,1) = {"
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
a
|
||||
"}
|
||||
@@ -6289,10 +6289,6 @@
|
||||
dir = 4;
|
||||
color = "#914886"
|
||||
},
|
||||
/obj/structure/sign/delam_procedure/directional/west{
|
||||
name = "Safety Moth - Server OOM Emergency Procedure";
|
||||
desc = "This informational sign uses Safety Moth™ to tell the viewer how to use the emergency stop button if the server decides to crash due to OOM again."
|
||||
},
|
||||
/turf/open/floor/iron/dark/smooth_large,
|
||||
/area/misc/condo)
|
||||
"MO" = (
|
||||
|
||||
Reference in New Issue
Block a user