cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all global variables handled by the GLOB controller (#13152)

Browse Source 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
This commit is contained in:
AffectedArc07
2020-03-20 21:56:37 -06:00
committed by GitHub
parent c8dbd0190e
commit 210f8badf4
667 changed files with 4243 additions and 4240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/marker_beacons.dm
+4 -4
View File
@@ -58,10 +58,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
transfer_fingerprints_to(M)
/obj/item/stack/marker_beacon/AltClick(mob/living/user)
if(!istype(user) || CanUseTopic(user, physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || CanUseTopic(user, physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
@@ -130,10 +130,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/structure/marker_beacon/AltClick(mob/living/user)
..()
if(!istype(user) || CanUseTopic(user, physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || CanUseTopic(user, physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
code/modules/mining/equipment/survival_pod.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/survivalcapsule/proc/get_template()
if(template)
return
template = shelter_templates[template_id]
template = GLOB.shelter_templates[template_id]
if(!template)
log_runtime("Shelter template ([template_id]) not found!", src)
qdel(src)