shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10796 from Tupinambis/StatusBugFix

Browse Source 
Status Display Fix: It's About Time
This commit is contained in:
Ghom
2020-02-02 01:51:07 +01:00
committed by GitHub
parent 77024e4451 ffa7590203
commit 2bb0a0311a
5 changed files with 264 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+20 -20
View File
@@ -7850,7 +7850,7 @@
/turf/open/floor/wood,
/area/lawoffice)
"asa" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/effect/turf_decal/tile/red{
@@ -13716,7 +13716,7 @@
/turf/open/floor/plating,
/area/chapel/main)
"aHu" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32
},
/turf/open/floor/plasteel/white/corner{
@@ -16757,7 +16757,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aPE" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/crew_quarters/locker)
"aPF" = (
@@ -16848,7 +16848,7 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
@@ -16880,7 +16880,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "bridge blast";
@@ -18156,7 +18156,7 @@
/area/hallway/secondary/exit)
"aTl" = (
/obj/machinery/vending/cola/random,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
layer = 4;
pixel_y = 32
},
@@ -18197,7 +18197,7 @@
/area/hallway/secondary/exit)
"aTr" = (
/obj/machinery/door/firedoor,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32
},
/turf/open/floor/plasteel,
@@ -21371,7 +21371,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"baZ" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
layer = 4;
pixel_y = 32
},
@@ -21528,7 +21528,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bbv" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/cable{
@@ -22164,7 +22164,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/effect/turf_decal/tile/blue{
@@ -23065,7 +23065,7 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
"bfw" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
"bfx" = (
@@ -25063,7 +25063,7 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/machinery/aug_manipulator,
@@ -27326,7 +27326,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bpw" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/medical/medbay/central)
"bpx" = (
@@ -28634,7 +28634,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bsz" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/turf/open/floor/plasteel/white/side{
@@ -32596,7 +32596,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = -32
},
/turf/open/floor/plasteel,
@@ -35471,7 +35471,7 @@
/area/medical/sleeper)
"bIe" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -42591,7 +42591,7 @@
/turf/open/floor/plating,
/area/tcommsat/computer)
"bZr" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/tcommsat/computer)
"bZs" = (
@@ -49648,7 +49648,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"cuc" = (
/obj/structure/rack,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = -32
},
/obj/item/storage/box/donkpockets,
@@ -50228,7 +50228,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cvf" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai)
"cvg" = (
@@ -50753,7 +50753,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/turf/open/floor/circuit,
_maps/map_files/Deltastation/DeltaStation2.dmm
+190 -190
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+43 -43
View File
@@ -421,7 +421,7 @@
},
/area/security/prison)
"abr" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/blue{
@@ -2472,7 +2472,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"afj" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32;
pixel_y = 32
},
@@ -2501,7 +2501,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"afn" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32;
pixel_y = 32
},
@@ -15058,7 +15058,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/red{
@@ -17819,7 +17819,7 @@
/obj/structure/chair{
name = "Judge"
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/light{
@@ -19088,7 +19088,7 @@
"aLO" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 30
},
/obj/effect/turf_decal/delivery,
@@ -21087,7 +21087,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/camera{
@@ -21381,7 +21381,7 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/machinery/flasher{
@@ -23713,7 +23713,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"aVm" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -23740,7 +23740,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"aVq" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -23803,7 +23803,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/stripes/line{
@@ -24135,7 +24135,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
@@ -24359,7 +24359,7 @@
pixel_x = -25;
pixel_y = 25
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/extinguisher_cabinet{
@@ -27493,7 +27493,7 @@
name = "Station Intercom (General)";
pixel_x = -29
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/effect/turf_decal/tile/neutral{
@@ -28332,7 +28332,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
"bdI" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -30143,7 +30143,7 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bhk" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/item/folder/yellow{
@@ -30795,7 +30795,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = -32
},
/turf/open/floor/plasteel/dark,
@@ -32463,7 +32463,7 @@
/area/ai_monitored/turret_protected/aisat/foyer)
"blC" = (
/obj/machinery/teleport/station,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
@@ -32572,7 +32572,7 @@
/area/ai_monitored/storage/satellite)
"blK" = (
/obj/machinery/recharge_station,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/cable/yellow{
@@ -33091,7 +33091,7 @@
/area/crew_quarters/heads/captain/private)
"bmJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/structure/disposalpipe/segment,
@@ -34052,7 +34052,7 @@
/obj/structure/displaycase/captain{
pixel_y = 5
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/turf/open/floor/wood,
@@ -35067,7 +35067,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bqF" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/blue{
@@ -35947,7 +35947,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bse" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/porta_turret/ai,
@@ -36179,7 +36179,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = -32
},
/obj/effect/turf_decal/tile/neutral{
@@ -36283,7 +36283,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
"bsP" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/bed/dogbed/ian,
@@ -37933,7 +37933,7 @@
/area/bridge)
"bwu" = (
/obj/machinery/holopad,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/light{
@@ -39063,7 +39063,7 @@
},
/area/engine/atmos)
"byS" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/light{
@@ -39533,7 +39533,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bzN" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/bot,
@@ -40057,7 +40057,7 @@
"bAW" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 31
},
/obj/item/folder/blue,
@@ -41121,7 +41121,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -41265,7 +41265,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -44514,7 +44514,7 @@
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/bot_white,
@@ -45284,7 +45284,7 @@
/area/maintenance/central)
"bLH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/machinery/camera{
@@ -49142,7 +49142,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
@@ -49213,7 +49213,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
@@ -52537,7 +52537,7 @@
pixel_y = 4
},
/obj/item/pen,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/light/small{
@@ -59310,7 +59310,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cnC" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/table/glass,
@@ -62450,7 +62450,7 @@
},
/area/crew_quarters/heads/hor)
"ctc" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/landmark/xmastree/rdrod,
@@ -65398,7 +65398,7 @@
"cyO" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/turf/open/floor/plasteel/white/side,
@@ -73012,7 +73012,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cMU" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
layer = 4
},
/turf/closed/wall,
@@ -76209,7 +76209,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 30
},
/obj/machinery/photocopier{
@@ -78350,7 +78350,7 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"deD" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"deI" = (
@@ -79825,7 +79825,7 @@
/area/maintenance/aft)
"diD" = (
/obj/machinery/vending/cigarette,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/sign/poster/official/random{
_maps/map_files/PubbyStation/PubbyStation.dmm
+10 -10
View File
@@ -3086,7 +3086,7 @@
/area/security/main)
"ajo" = (
/obj/machinery/vending/coffee,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/red{
@@ -3427,7 +3427,7 @@
"akc" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/light{
@@ -6882,7 +6882,7 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"arK" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/item/folder/yellow{
@@ -9248,7 +9248,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/blue{
@@ -11380,7 +11380,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aBF" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/structure/bed/dogbed/ian,
@@ -14151,7 +14151,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/effect/turf_decal/tile/neutral{
@@ -17493,7 +17493,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"aQt" = (
/obj/machinery/status_display,
/obj/machinery/status_display/evac,
/turf/closed/wall,
/area/hallway/secondary/exit/departure_lounge)
"aQu" = (
@@ -24292,7 +24292,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 30
},
/turf/open/floor/plasteel/dark,
@@ -36929,7 +36929,7 @@
/area/medical/surgery)
"bHc" = (
/obj/machinery/computer/med_data,
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_y = 32
},
/turf/open/floor/plasteel/freezer,
@@ -48691,7 +48691,7 @@
/turf/open/space,
/area/space/nearstation)
"cmu" = (
/obj/machinery/status_display{
/obj/machinery/status_display/evac{
pixel_x = -32
},
/obj/structure/table,
code/game/machinery/status_display.dm
+1 -1
View File
@@ -15,7 +15,7 @@
#define SD_AI_EMOTE 1 // 1 = AI emoticon
#define SD_AI_BSOD 2 // 2 = Blue screen of death
/// Status display which can show images and scrolling text.
/// Status display which can show images and scrolling text. !!!USE /obj/machinery/status_display/evac NOT THIS!!!
/obj/machinery/status_display
name = "status display"
desc = null