cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +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-21 03:56:37 +00: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)
code/modules/mining/laborcamp/laborstacker.dm
+1 -1
View File
@@ -58,7 +58,7 @@ GLOBAL_LIST(labor_sheet_values)
/obj/machinery/mineral/labor_claim_console/attack_ghost(mob/user)
attack_hand(user)
/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "labor_claim_console.tmpl", name, 450, 625, state)
code/modules/mining/lavaland/loot/colossus_loot.dm
+1 -1
View File
@@ -374,7 +374,7 @@
..()
verbs -= /mob/living/verb/pulled
verbs -= /mob/verb/me_verb
var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medsensor.add_hud_to(src)
/mob/living/simple_animal/hostile/lightgeist/AttackingTarget()
code/modules/mining/lavaland/loot/hierophant_loot.dm
+1 -1
View File
@@ -254,7 +254,7 @@
var/obj/effect/temp_visual/hierophant/blast/B = new(T, user, friendly_fire_check)
B.damage = HIEROPHANT_CLUB_CARDINAL_DAMAGE
B.monster_damage_boost = FALSE
for(var/d in cardinal)
for(var/d in GLOB.cardinal)
INVOKE_ASYNC(src, .proc/blast_wall, T, d, user)
/obj/item/hierophant_club/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
code/modules/mining/machine_redemption.dm
+1 -1
View File
@@ -159,7 +159,7 @@
if(!has_minerals)
return
for(var/obj/machinery/requests_console/D in allConsoles)
for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
if(D.department in src.supply_consoles)
if(supply_consoles[D.department] == null || (mineral_name in supply_consoles[D.department]))
D.createMessage("Ore Redemption Machine", "New Minerals Available!", msg, 1)
code/modules/mining/ores_coins.dm
+1 -1
View File
@@ -19,7 +19,7 @@
pixel_x = rand(0, 16) - 8
pixel_y = rand(0, 8) - 8
if(is_mining_level(z))
score_oremined++ //When ore spawns, increment score. Only include ore spawned on mining level (No Clown Planet)
GLOB.score_oremined++ //When ore spawns, increment score. Only include ore spawned on mining level (No Clown Planet)
/obj/item/stack/ore/welder_act(mob/user, obj/item/I)
. = TRUE