cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +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/reagents/chem_splash.dm
+2 -2
View File
@@ -41,7 +41,7 @@
for(var/turf/T in (orange(i, epicenter) - orange(i-1, epicenter)))
turflist |= T
for(var/turf/T in turflist)
if( !(get_dir(T,epicenter) in cardinal) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y) ))
if( !(get_dir(T,epicenter) in GLOB.cardinal) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y) ))
turflist.Remove(T)
turflist.Add(T) // we move the purely diagonal turfs to the end of the list.
for(var/turf/T in turflist)
@@ -51,7 +51,7 @@
var/turf/NT = thing
if(!(NT in accessible))
continue
if(!(get_dir(T,NT) in cardinal))
if(!(get_dir(T,NT) in GLOB.cardinal))
continue
accessible[T] = 1
break
code/modules/reagents/chemistry/colors.dm
+1 -1
View File
@@ -2,7 +2,7 @@
* Returns:
* #RRGGBB(AA) on success, null on failure
*/
var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
GLOBAL_LIST_INIT(random_color_list, list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700"))
/proc/mix_color_from_reagents(const/list/reagent_list)
if(!istype(reagent_list))
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -155,7 +155,7 @@
// open the new ui window
ui.open()
/obj/machinery/chem_dispenser/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/chem_dispenser/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["amount"] = amount
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -140,7 +140,7 @@
ui = new(user, src, ui_key, "chem_heater.tmpl", "ChemHeater", 350, 270)
ui.open()
/obj/machinery/chem_heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/chem_heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["targetTemp"] = desired_temp
code/modules/reagents/chemistry/machinery/chem_master.dm
+1 -1
View File
@@ -445,7 +445,7 @@
ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 500)
ui.open()
/obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["condi"] = condi
code/modules/reagents/chemistry/machinery/pandemic.dm
+10 -10
View File
@@ -84,8 +84,8 @@
var/vaccine_name = "Unknown"
if(!ispath(vaccine_type))
if(archive_diseases[path])
var/datum/disease/D = archive_diseases[path]
if(GLOB.archive_diseases[path])
var/datum/disease/D = GLOB.archive_diseases[path]
if(D)
vaccine_name = D.name
vaccine_type = path
@@ -109,11 +109,11 @@
var/datum/disease/D = null
if(!ispath(type))
D = GetVirusByIndex(text2num(href_list["create_virus_culture"]))
var/datum/disease/advance/A = archive_diseases[D.GetDiseaseID()]
var/datum/disease/advance/A = GLOB.archive_diseases[D.GetDiseaseID()]
if(A)
D = new A.type(0, A)
else if(type)
if(type in diseases) // Make sure this is a disease
if(type in GLOB.diseases) // Make sure this is a disease
D = new type(0, null)
if(!D)
return
@@ -154,15 +154,15 @@
if(..())
return
var/id = GetVirusTypeByIndex(text2num(href_list["name_disease"]))
if(archive_diseases[id])
var/datum/disease/advance/A = archive_diseases[id]
if(GLOB.archive_diseases[id])
var/datum/disease/advance/A = GLOB.archive_diseases[id]
A.AssignName(new_name)
for(var/datum/disease/advance/AD in GLOB.active_diseases)
AD.Refresh()
updateUsrDialog()
else if(href_list["print_form"])
var/datum/disease/D = GetVirusByIndex(text2num(href_list["print_form"]))
D = archive_diseases[D.GetDiseaseID()]//We know it's advanced no need to check
D = GLOB.archive_diseases[D.GetDiseaseID()]//We know it's advanced no need to check
print_form(D, usr)
@@ -180,7 +180,7 @@
//Prints a nice virus release form. Props to Urbanliner for the layout
/obj/machinery/computer/pandemic/proc/print_form(var/datum/disease/advance/D, mob/living/user)
D = archive_diseases[D.GetDiseaseID()]
D = GLOB.archive_diseases[D.GetDiseaseID()]
if(!(printing) && D)
var/reason = input(user,"Enter a reason for the release", "Write", null) as message
reason += "<span class=\"paper_field\"></span>"
@@ -260,7 +260,7 @@
if(istype(D, /datum/disease/advance))
var/datum/disease/advance/A = D
D = archive_diseases[A.GetDiseaseID()]
D = GLOB.archive_diseases[A.GetDiseaseID()]
if(D)
if(D.name == "Unknown")
dat += "<b><a href='?src=[UID()];name_disease=[i]'>Name Disease</a></b><BR>"
@@ -300,7 +300,7 @@
var/disease_name = "Unknown"
if(!ispath(type))
var/datum/disease/advance/A = archive_diseases[type]
var/datum/disease/advance/A = GLOB.archive_diseases[type]
if(A)
disease_name = A.name
else
code/modules/reagents/chemistry/reagents/drugs.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/datum/reagent/lithium/on_mob_life(mob/living/M)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
step(M, pick(GLOB.cardinal))
if(prob(5))
M.emote(pick("twitch","drool","moan"))
return ..()
@@ -45,7 +45,7 @@
update_flags |= M.Druggy(15, FALSE)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
step(M, pick(GLOB.cardinal))
if(prob(7))
M.emote(pick("twitch","drool","moan","giggle"))
return ..() | update_flags
code/modules/reagents/chemistry/reagents/misc.dm
+3 -3
View File
@@ -310,14 +310,14 @@
/datum/reagent/colorful_reagent/reaction_mob(mob/living/simple_animal/M, method=REAGENT_TOUCH, volume)
if(isanimal(M))
M.color = pick(random_color_list)
M.color = pick(GLOB.random_color_list)
..()
/datum/reagent/colorful_reagent/reaction_obj(obj/O, volume)
O.color = pick(random_color_list)
O.color = pick(GLOB.random_color_list)
/datum/reagent/colorful_reagent/reaction_turf(turf/T, volume)
T.color = pick(random_color_list)
T.color = pick(GLOB.random_color_list)
/datum/reagent/hair_dye
name = "Quantum Hair Dye"