cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

BRUTAL Part 1 - No proc var/ in procs

Browse Source
This commit is contained in:
AffectedArc07
2021-02-01 14:10:08 +00:00
parent 1d89138436
commit f5f97882cf
533 changed files with 1558 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/gear_tweaks.dm
+15 -15
View File
@@ -1,16 +1,16 @@
/datum/gear_tweak/proc/get_contents(var/metadata)
/datum/gear_tweak/proc/get_contents(metadata)
return
/datum/gear_tweak/proc/get_metadata(var/user, var/metadata)
/datum/gear_tweak/proc/get_metadata(user, metadata)
return
/datum/gear_tweak/proc/get_default()
return
/datum/gear_tweak/proc/tweak_gear_data(var/metadata, var/datum/gear_data)
/datum/gear_tweak/proc/tweak_gear_data(metadata, datum/gear_data)
return
/datum/gear_tweak/proc/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/proc/tweak_item(obj/item/I, metadata)
return
/*
@@ -21,22 +21,22 @@ GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
/datum/gear_tweak/color
var/list/valid_colors
/datum/gear_tweak/color/New(var/list/colors)
/datum/gear_tweak/color/New(list/colors)
valid_colors = colors
..()
/datum/gear_tweak/color/get_contents(var/metadata)
/datum/gear_tweak/color/get_contents(metadata)
return "Color: <font color='[metadata]'>&#9899;</font>"
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
/datum/gear_tweak/color/get_metadata(user, metadata)
if(valid_colors)
return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
/datum/gear_tweak/color/tweak_item(obj/item/I, metadata)
if(valid_colors && !(metadata in valid_colors))
return
I.color = metadata
@@ -48,20 +48,20 @@ GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
/datum/gear_tweak/path
var/list/valid_paths
/datum/gear_tweak/path/New(var/list/paths)
/datum/gear_tweak/path/New(list/paths)
valid_paths = paths
..()
/datum/gear_tweak/path/get_contents(var/metadata)
/datum/gear_tweak/path/get_contents(metadata)
return "Type: [metadata]"
/datum/gear_tweak/path/get_default()
return valid_paths[1]
/datum/gear_tweak/path/get_metadata(var/user, var/metadata)
/datum/gear_tweak/path/get_metadata(user, metadata)
return input(user, "Choose a type.", "Character Preference", metadata) as null|anything in valid_paths
/datum/gear_tweak/path/tweak_gear_data(var/metadata, var/datum/gear_data/gear_data)
/datum/gear_tweak/path/tweak_gear_data(metadata, datum/gear_data/gear_data)
if(!(metadata in valid_paths))
return
gear_data.path = valid_paths[metadata]
@@ -77,7 +77,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
valid_contents = args.Copy()
..()
/datum/gear_tweak/contents/get_contents(var/metadata)
/datum/gear_tweak/contents/get_contents(metadata)
return "Contents: [english_list(metadata, and_text = ", ")]"
/datum/gear_tweak/contents/get_default()
@@ -85,7 +85,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
for(var/i = 1 to valid_contents.len)
. += "Random"
/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
/datum/gear_tweak/contents/get_metadata(user, list/metadata)
. = list()
for(var/i = metadata.len to valid_contents.len)
metadata += "Random"
@@ -96,7 +96,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new())
else
return metadata
/datum/gear_tweak/contents/tweak_item(var/obj/item/I, var/list/metadata)
/datum/gear_tweak/contents/tweak_item(obj/item/I, list/metadata)
if(metadata.len != valid_contents.len)
return
for(var/i = 1 to valid_contents.len)
code/modules/client/preference/preferences.dm
+7 -7
View File
@@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
return max(0, minimal_player_age_antag - C.player_age)
/proc/check_client_age(client/C, var/days) // If days isn't provided, returns the age of the client. If it is provided, it returns the days until the player_age is equal to or greater than the days variable
/proc/check_client_age(client/C, days) // If days isn't provided, returns the age of the client. If it is provided, it returns the days until the player_age is equal to or greater than the days variable
if(!days)
return C.player_age
else
@@ -570,20 +570,20 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
popup.open(0)
/datum/preferences/proc/get_gear_metadata(var/datum/gear/G)
/datum/preferences/proc/get_gear_metadata(datum/gear/G)
. = loadout_gear[G.display_name]
if(!.)
. = list()
loadout_gear[G.display_name] = .
/datum/preferences/proc/get_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak)
/datum/preferences/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak)
var/list/metadata = get_gear_metadata(G)
. = metadata["[tweak]"]
if(!.)
. = tweak.get_default()
metadata["[tweak]"] = .
/datum/preferences/proc/set_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak, var/new_metadata)
/datum/preferences/proc/set_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak, new_metadata)
var/list/metadata = get_gear_metadata(G)
metadata["[tweak]"] = new_metadata
@@ -752,7 +752,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
popup.open(0)
return
/datum/preferences/proc/SetJobPreferenceLevel(var/datum/job/job, var/level)
/datum/preferences/proc/SetJobPreferenceLevel(datum/job/job, level)
if(!job)
return 0
@@ -975,7 +975,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
job_karma_low = 0
/datum/preferences/proc/GetJobDepartment(var/datum/job/job, var/level)
/datum/preferences/proc/GetJobDepartment(datum/job/job, level)
if(!job || !level) return 0
switch(job.department_flag)
if(JOBCAT_SUPPORT)
@@ -1012,7 +1012,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
return job_karma_low
return 0
/datum/preferences/proc/SetJobDepartment(var/datum/job/job, var/level)
/datum/preferences/proc/SetJobDepartment(datum/job/job, level)
if(!job || !level) return 0
switch(level)
if(1)//Only one of these should ever be active at once so clear them all here