cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix blueshift atmos sanity flaky test. Also a hard delete flake. (#6117)"

Browse Source 
This reverts commit 5f203e0d28.
This commit is contained in:
ArrisFairburne
2026-08-17 19:27:20 -04:00
committed by GitHub
parent 5f203e0d28
commit 9362c6a80f
2 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Blueshift/Blueshift.dmm
+28 -42
View File
@@ -7068,6 +7068,8 @@
/area/space/nearstation)
"bsN" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/camera/directional/south{
c_tag = "Security - Shuttle Bay East"
},
@@ -22057,7 +22059,6 @@
"ejd" = (
/obj/structure/railing/corner/end,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"eje" = (
@@ -27160,8 +27161,6 @@
/obj/structure/railing{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs,
/area/station/security/execution/transfer)
"feL" = (
@@ -32887,7 +32886,6 @@
"glU" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"glW" = (
@@ -45962,7 +45960,6 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"iNE" = (
@@ -48731,6 +48728,8 @@
/obj/structure/railing{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/stairs,
/area/station/security/execution/transfer)
"jpC" = (
@@ -71465,6 +71464,8 @@
/obj/machinery/door/airlock/security/glass{
name = "Security Shuttlebay"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
@@ -72039,8 +72040,6 @@
/area/station/medical/psychology)
"nOQ" = (
/obj/item/stack/cable_coil,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"nPa" = (
@@ -76129,12 +76128,6 @@
dir = 8
},
/area/station/command/heads_quarters/nt_rep)
"oAp" = (
/obj/effect/decal/cleanable/blood/oil/slippery,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"oAu" = (
/obj/structure/chair/sofa/middle/brown,
/obj/structure/window/spawner/directional/north,
@@ -99267,7 +99260,6 @@
"sVu" = (
/obj/structure/railing/corner/end/flip,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"sVz" = (
@@ -107406,6 +107398,8 @@
/area/station/science/genetics)
"uwI" = (
/obj/effect/turf_decal/vg_decals/numbers/one,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"uwO" = (
@@ -115102,10 +115096,9 @@
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/captain/private)
"vUC" = (
/obj/effect/turf_decal/box/white/corners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"vUH" = (
/obj/machinery/door/airlock/maintenance_hatch,
@@ -119199,17 +119192,6 @@
},
/turf/open/floor/iron,
/area/station/service/bar/atrium)
"wGJ" = (
/obj/effect/turf_decal/stripes/full,
/obj/effect/turf_decal/stripes/white/full,
/obj/machinery/door/poddoor/shutters{
id = "securitydock2";
name = "Security Dock 2"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
"wGO" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating,
@@ -119245,7 +119227,9 @@
"wHi" = (
/obj/structure/cable,
/obj/effect/landmark/start/botanist,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment{
dir = 10
@@ -126845,6 +126829,8 @@
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
"yfU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/iron,
@@ -150458,14 +150444,14 @@ euE
euE
faw
euE
oyI
euE
nOQ
oyI
oyI
vUC
wGJ
oyI
sBh
euE
euE
cgu
sAN
euE
iHC
tNz
tNz
tNz
@@ -150715,7 +150701,7 @@ doG
eTH
iNB
feJ
oAp
faw
mhN
bdt
mhN
@@ -151742,7 +151728,7 @@ euE
euE
euE
euE
euE
oyI
euE
euE
euE
@@ -151999,7 +151985,7 @@ faw
euE
euE
euE
euE
oyI
inc
euE
euE
@@ -152513,7 +152499,7 @@ euE
euE
euE
inc
euE
oyI
euE
faw
euE
@@ -152770,7 +152756,7 @@ euE
piH
euE
euE
euE
oyI
euE
kWs
piH
@@ -153284,7 +153270,7 @@ dwK
mgt
iHC
mhN
jHK
vUC
mhN
iHC
xYh
@@ -154055,7 +154041,7 @@ iRb
xJs
jMz
sIh
jHK
vUC
hZI
uda
wJg
code/modules/power/monitor.dm
-4
View File
@@ -25,10 +25,6 @@
history["supply"] = list()
history["demand"] = list()
/obj/machinery/computer/monitor/Destroy(force)
SSmachines.processing_late -= src
return ..()
/obj/machinery/computer/monitor/process_late()
if(!get_powernet())
update_use_power(IDLE_POWER_USE)