mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
Fix potential lag source from active atmos turfs on blueshift (#12532)
* Fix potential lag source from active atmos turfs * Fixed some oversights and additional bugs * Cleaned up some cables and touched up minor things (also hopefully this fixes integration) * Probably fixed a runtime plus some additional oversights * Fixed bandana caused runtime errors (wut) * remove redsec stuff * removed a redsec vendor i forgot to remove earlyer * Fixed the issues with the merge conflicts and the linters. Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
IsaacTheSharkWolf
co-authored by
GoldenAlpharex
GoldenAlpharex
parent
868626c824
commit
d396c036cf
@@ -1846,11 +1846,6 @@
|
||||
/obj/item/weldingtool,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"bCV" = (
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/obj/structure/closet,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"bDa" = (
|
||||
/obj/effect/turf_decal/stripes,
|
||||
/turf/open/floor/plating,
|
||||
@@ -1993,6 +1988,10 @@
|
||||
/obj/effect/spawner/random/structure/crate,
|
||||
/turf/open/floor/iron,
|
||||
/area/cargo/storage)
|
||||
"bJC" = (
|
||||
/obj/machinery/vending/wardrobe/sec_wardrobe,
|
||||
/turf/open/floor/iron,
|
||||
/area/security/checkpoint)
|
||||
"bJJ" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
@@ -4228,12 +4227,6 @@
|
||||
/obj/structure/tank_dispenser/oxygen,
|
||||
/turf/open/floor/mineral/titanium/blue/airless,
|
||||
/area/space/nearstation)
|
||||
"dtF" = (
|
||||
/obj/machinery/door/airlock/maintenance,
|
||||
/obj/structure/barricade/wooden/crude,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"dtN" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "External Airlock";
|
||||
@@ -4616,23 +4609,10 @@
|
||||
/obj/machinery/status_display/ai/directional/east,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/engineering/atmospherics_engine)
|
||||
"dGu" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"dGx" = (
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/maintenance/port)
|
||||
"dGL" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/meter,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"dGP" = (
|
||||
/obj/effect/turf_decal/stripes{
|
||||
dir = 1
|
||||
@@ -7317,6 +7297,13 @@
|
||||
},
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/engineering/atmos)
|
||||
"gsz" = (
|
||||
/obj/machinery/meter,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"gtx" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/beakers/variety{
|
||||
@@ -10908,25 +10895,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port)
|
||||
"jVm" = (
|
||||
/obj/machinery/button/ignition{
|
||||
id = "Incinerator";
|
||||
pixel_x = 24;
|
||||
pixel_y = 9
|
||||
},
|
||||
/obj/machinery/button/door/incinerator_vent_atmos_aux{
|
||||
pixel_x = 25;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/machinery/button/door/incinerator_vent_atmos_main{
|
||||
pixel_x = 39;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"jVH" = (
|
||||
/obj/effect/turf_decal/trimline/neutral/filled/line,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -11571,13 +11539,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"kxp" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"kyN" = (
|
||||
/obj/machinery/portable_atmospherics/canister/air,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -12537,18 +12498,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/engineering/atmos)
|
||||
"lqe" = (
|
||||
/obj/machinery/door/airlock{
|
||||
name = "Arrivals Snack Bar"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/hallway/secondary/entry)
|
||||
"lqq" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable,
|
||||
@@ -13379,6 +13328,17 @@
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/turf/open/floor/iron,
|
||||
/area/engineering/atmos)
|
||||
"mhn" = (
|
||||
/obj/machinery/camera/directional/west{
|
||||
c_tag = "Atmospherics - Incinerator";
|
||||
name = "atmospherics camera"
|
||||
},
|
||||
/obj/machinery/light/directional/west,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
|
||||
/obj/item/radio/intercom/directional/west,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"mhs" = (
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
@@ -13403,6 +13363,14 @@
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/engineering/atmos)
|
||||
"mif" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Thruster Engine Room";
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/abandoned,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"mik" = (
|
||||
/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
|
||||
icon_state = "1,0"
|
||||
@@ -13663,14 +13631,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/engineering/atmos/project)
|
||||
"mtC" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"mtE" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
|
||||
@@ -16160,10 +16120,6 @@
|
||||
"omM" = (
|
||||
/turf/open/floor/plating/elevatorshaft,
|
||||
/area/cargo/storage)
|
||||
"omX" = (
|
||||
/obj/machinery/suit_storage_unit/industrial,
|
||||
/turf/open/floor/iron,
|
||||
/area/cargo/storage)
|
||||
"omZ" = (
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 8
|
||||
@@ -16371,12 +16327,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port)
|
||||
"owU" = (
|
||||
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/tritium{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"oxu" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
|
||||
@@ -17537,20 +17487,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/engineering/atmos)
|
||||
"pEF" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/camera/directional/west{
|
||||
c_tag = "Atmospherics - Incinerator";
|
||||
name = "atmospherics camera"
|
||||
},
|
||||
/obj/machinery/light/directional/west,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
|
||||
/obj/item/radio/intercom/directional/west,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"pEV" = (
|
||||
/obj/item/kirbyplants{
|
||||
icon_state = "plant-21"
|
||||
@@ -19041,13 +18977,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/cargo/storage)
|
||||
"qYl" = (
|
||||
/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/hidden,
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"qYC" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 6
|
||||
@@ -20099,6 +20028,19 @@
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"sam" = (
|
||||
/obj/machinery/door/airlock{
|
||||
name = "Arrivals Snack Bar"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/barricade/wooden/crude,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/hallway/secondary/entry)
|
||||
"sas" = (
|
||||
/obj/effect/turf_decal/stripes{
|
||||
dir = 8
|
||||
@@ -20284,6 +20226,25 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/maintenance/port)
|
||||
"shU" = (
|
||||
/obj/machinery/button/ignition{
|
||||
id = "Incinerator";
|
||||
pixel_x = 24;
|
||||
pixel_y = 9
|
||||
},
|
||||
/obj/machinery/button/door/incinerator_vent_atmos_aux{
|
||||
pixel_x = 25;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/machinery/button/door/incinerator_vent_atmos_main{
|
||||
pixel_x = 39;
|
||||
pixel_y = -7
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"siq" = (
|
||||
/obj/machinery/light/small/directional/north,
|
||||
/turf/open/floor/plating,
|
||||
@@ -21732,6 +21693,13 @@
|
||||
},
|
||||
/turf/open/floor/iron/bluespace,
|
||||
/area/engineering/atmos)
|
||||
"tGx" = (
|
||||
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/hidden,
|
||||
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"tGH" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/light/floor,
|
||||
@@ -22375,6 +22343,11 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"usG" = (
|
||||
/obj/machinery/door/airlock/maintenance,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"utB" = (
|
||||
/obj/structure/table,
|
||||
/obj/effect/spawner/random/exotic/tool,
|
||||
@@ -23672,6 +23645,11 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/maintenance/port)
|
||||
"vwd" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"vwh" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
|
||||
dir = 5
|
||||
@@ -23691,12 +23669,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/maintenance/department/electrical)
|
||||
"vwU" = (
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"vwX" = (
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
dir = 8
|
||||
@@ -23729,10 +23701,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/cargo/warehouse)
|
||||
"vxQ" = (
|
||||
/obj/machinery/vending/wardrobe/sec_wardrobe,
|
||||
/turf/open/floor/iron,
|
||||
/area/security/checkpoint)
|
||||
"vxX" = (
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/iron/dark,
|
||||
@@ -26025,12 +25993,6 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/aft)
|
||||
"xmK" = (
|
||||
/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"xnk" = (
|
||||
/obj/machinery/light/directional/south,
|
||||
/obj/machinery/camera/directional/south{
|
||||
@@ -27190,6 +27152,10 @@
|
||||
/obj/effect/landmark/xeno_spawn,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"ygF" = (
|
||||
/obj/item/storage/toolbox/emergency,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"yhe" = (
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/aft)
|
||||
@@ -63318,8 +63284,8 @@ peu
|
||||
qpW
|
||||
qQt
|
||||
uzi
|
||||
mtC
|
||||
pEF
|
||||
vwd
|
||||
mhn
|
||||
nNF
|
||||
jqK
|
||||
jqK
|
||||
@@ -63575,8 +63541,8 @@ oZF
|
||||
fBn
|
||||
wnO
|
||||
pUr
|
||||
xmK
|
||||
dGu
|
||||
ePX
|
||||
ePX
|
||||
ePX
|
||||
ygk
|
||||
xGx
|
||||
@@ -63832,9 +63798,9 @@ eFl
|
||||
xQJ
|
||||
ahK
|
||||
coh
|
||||
owU
|
||||
kxp
|
||||
vwU
|
||||
ePX
|
||||
ePX
|
||||
ePX
|
||||
ygk
|
||||
gQZ
|
||||
ygk
|
||||
@@ -64089,8 +64055,8 @@ tie
|
||||
ooK
|
||||
jGN
|
||||
cWm
|
||||
jVm
|
||||
dGL
|
||||
shU
|
||||
gsz
|
||||
ePX
|
||||
ygk
|
||||
ygk
|
||||
@@ -64346,7 +64312,7 @@ nkI
|
||||
poy
|
||||
odt
|
||||
stZ
|
||||
odt
|
||||
csO
|
||||
csO
|
||||
ePX
|
||||
ePX
|
||||
@@ -64603,7 +64569,7 @@ nlR
|
||||
hky
|
||||
mxu
|
||||
wZu
|
||||
qYl
|
||||
tGx
|
||||
tKs
|
||||
pWd
|
||||
pWd
|
||||
@@ -65608,7 +65574,7 @@ rwy
|
||||
exZ
|
||||
ksz
|
||||
fsf
|
||||
vxQ
|
||||
bJC
|
||||
aOM
|
||||
vqH
|
||||
ycO
|
||||
@@ -66334,7 +66300,7 @@ vvN
|
||||
nUo
|
||||
xPI
|
||||
xPI
|
||||
omX
|
||||
xPI
|
||||
mwS
|
||||
xPI
|
||||
ggF
|
||||
@@ -67418,7 +67384,7 @@ xbp
|
||||
xbp
|
||||
iBy
|
||||
xEs
|
||||
uJI
|
||||
mif
|
||||
yiW
|
||||
eWU
|
||||
obV
|
||||
@@ -68444,7 +68410,7 @@ uUQ
|
||||
cVd
|
||||
jQr
|
||||
wjI
|
||||
bCV
|
||||
dRj
|
||||
xEs
|
||||
nvG
|
||||
eWU
|
||||
@@ -69210,7 +69176,7 @@ viX
|
||||
kjl
|
||||
wjI
|
||||
wjI
|
||||
lqe
|
||||
sam
|
||||
wjI
|
||||
mON
|
||||
iPs
|
||||
@@ -69733,7 +69699,7 @@ yiW
|
||||
yiW
|
||||
xEs
|
||||
fJb
|
||||
yiW
|
||||
xLV
|
||||
xKG
|
||||
ylQ
|
||||
ylQ
|
||||
@@ -69983,14 +69949,14 @@ wjI
|
||||
kkj
|
||||
xEs
|
||||
xEs
|
||||
dtF
|
||||
usG
|
||||
vpR
|
||||
xEs
|
||||
xEs
|
||||
xEs
|
||||
xEs
|
||||
yiW
|
||||
yiW
|
||||
ygF
|
||||
xKG
|
||||
ylQ
|
||||
ylQ
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user