it compiles, that's better than it not compiling, right?

This commit is contained in:
Pinta
2024-03-24 06:36:59 -04:00
parent d46cf2d981
commit 63009681fa
452 changed files with 1046 additions and 987 deletions
@@ -6,13 +6,13 @@
/datum/component/souldeath/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/equip)
RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unequip)
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED,PROC_REF(equip))
RegisterSignal(parent, COMSIG_ITEM_DROPPED,PROC_REF(unequip))
/datum/component/souldeath/proc/equip(datum/source, mob/living/equipper, slot)
if(!slot || equip_slot == slot)
wearer = equipper
RegisterSignal(wearer, COMSIG_MOB_DEATH, .proc/die, TRUE)
RegisterSignal(wearer, COMSIG_MOB_DEATH,PROC_REF(die), TRUE)
signal = TRUE
else
if(signal)
@@ -230,8 +230,8 @@
master = get_mob_by_key(enthrallID)
//if(M.ckey == enthrallID)
// owner.remove_status_effect(src)//At the moment, a user can enthrall themselves, toggle this back in if that should be removed.
RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist) //Do resistance calc if resist is pressed#
RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear)
RegisterSignal(owner, COMSIG_LIVING_RESIST,PROC_REF(owner_resist)) //Do resistance calc if resist is pressed#
RegisterSignal(owner, COMSIG_MOVABLE_HEAR,PROC_REF(owner_hear))
//var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN) //removing this, may cause some issues unsure.
mental_capacity = 500 - M.getOrganLoss(ORGAN_SLOT_BRAIN)//It's their brain!
var/mob/living/carbon/human/H = owner
@@ -594,7 +594,7 @@
var/saytext = "Your mouth moves on it's own before you can even catch it."
if(HAS_TRAIT(C, TRAIT_NYMPHO))
saytext += " You find yourself fully believing in the validity of what you just said and don't think to question it."
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "<span class='notice'><i>[saytext]</i></span>"), 5)
addtimer(CALLBACK(GLOBAL_PROC_REF(to_chat), C, "<span class='notice'><i>[saytext]</i></span>"), 5)
addtimer(CALLBACK(C, /atom/movable/proc/say, "[customTriggers[trigger][2]]"), 5)
//(C.say(customTriggers[trigger][2]))//trigger3
log_game("FERMICHEM: MKULTRA: [owner] ckey: [owner.key] has been forced to say: \"[customTriggers[trigger][2]]\" from previous trigger.")
@@ -602,7 +602,7 @@
//Echo (repeats message!) allows customisation, but won't display var calls! Defaults to hypnophrase.
else if (lowertext(customTriggers[trigger][1]) == "echo")//trigger2
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "<span class='velvet'><i>[customTriggers[trigger][2]]</i></span>"), 5)
addtimer(CALLBACK(GLOBAL_PROC_REF(to_chat), C, "<span class='velvet'><i>[customTriggers[trigger][2]]</i></span>"), 5)
//(to_chat(owner, "<span class='hypnophrase'><i>[customTriggers[trigger][2]]</i></span>"))//trigger3
//Shocking truth!
@@ -102,9 +102,9 @@
/datum/antagonist/gang/get_admin_commands()
. = ..()
.["Promote"] = CALLBACK(src,.proc/admin_promote)
.["Set Influence"] = CALLBACK(src, .proc/admin_adjust_influence)
.["Set Influence"] = CALLBACK(src,PROC_REF(admin_adjust_influence))
if(gang.domination_time != NOT_DOMINATING)
.["Set domination time left"] = CALLBACK(src, .proc/set_dom_time_left)
.["Set domination time left"] = CALLBACK(src,PROC_REF(set_dom_time_left))
/datum/antagonist/gang/admin_add(datum/mind/new_owner,mob/admin)
var/new_or_existing = input(admin, "Which gang do you want to be assigned to the user?", "Gangs") as null|anything in list("New","Existing")
@@ -321,7 +321,7 @@
CJ.add_antag_datum(bossdatum, src)
bossdatum.equip_gang()
next_point_time = world.time + INFLUENCE_INTERVAL
addtimer(CALLBACK(src, .proc/handle_territories), INFLUENCE_INTERVAL)
addtimer(CALLBACK(src,PROC_REF(handle_territories)), INFLUENCE_INTERVAL)
/datum/team/gang/Destroy()
GLOB.gangs -= src
@@ -404,7 +404,7 @@
influence = new_influence
message += "Your gang now has <b>[influence] influence</b>.<BR>"
message_gangtools(message)
addtimer(CALLBACK(src, .proc/handle_territories), INFLUENCE_INTERVAL)
addtimer(CALLBACK(src,PROC_REF(handle_territories)), INFLUENCE_INTERVAL)
/datum/team/gang/proc/total_claimable_territories()
var/list/valid_territories = list()
@@ -32,7 +32,7 @@
cooldown = TRUE
icon_state = "pen_blink"
var/cooldown_time = 600/gang.leaders.len
addtimer(CALLBACK(src, .proc/cooldown), cooldown_time)
addtimer(CALLBACK(src,PROC_REF(cooldown)), cooldown_time)
/obj/item/pen/gang/proc/cooldown()
cooldown = FALSE
@@ -175,13 +175,13 @@
gang.message_gangtools("[user] is attempting to recall the emergency shuttle.")
recalling = TRUE
to_chat(user, "<span class='info'>[icon2html(src, loc)]Generating shuttle recall order with codes retrieved from last call signal...</span>")
addtimer(CALLBACK(src, .proc/recall2, user), rand(100,300))
addtimer(CALLBACK(src,PROC_REF(recall2), user), rand(100,300))
/obj/item/device/gangtool/proc/recall2(mob/user)
if(!recallchecks(user))
return
to_chat(user, "<span class='info'>[icon2html(src, loc)]Shuttle recall order generated. Accessing station long-range communication arrays...</span>")
addtimer(CALLBACK(src, .proc/recall3, user), rand(100,300))
addtimer(CALLBACK(src,PROC_REF(recall3), user), rand(100,300))
/obj/item/device/gangtool/proc/recall3(mob/user)
if(!recallchecks(user))
@@ -196,7 +196,7 @@
recalling = FALSE
return
to_chat(user, "<span class='info'>[icon2html(src, loc)]Comm arrays accessed. Broadcasting recall signal...</span>")
addtimer(CALLBACK(src, .proc/recallfinal, user), rand(100,300))
addtimer(CALLBACK(src,PROC_REF(recallfinal), user), rand(100,300))
/obj/item/device/gangtool/proc/recallfinal(mob/user)
if(!recallchecks(user))
@@ -37,7 +37,7 @@
/obj/machinery/autoylathe/Initialize()
. = ..()
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASTIC), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASTIC), 0, TRUE, null, null, CALLBACK(src,PROC_REF(AfterMaterialInsert)))
wires = new /datum/wires/autoylathe(src)
stored_research = new /datum/techweb/specialized/autounlocking/autoylathe
@@ -163,7 +163,7 @@
use_power(power)
icon_state = "autolathe_n"
var/time = is_stack ? 32 : 32*coeff*multiplier
addtimer(CALLBACK(src, .proc/make_item, power, metal_cost, glass_cost, plastic_cost, multiplier, coeff, is_stack), time)
addtimer(CALLBACK(src,PROC_REF(make_item), power, metal_cost, glass_cost, plastic_cost, multiplier, coeff, is_stack), time)
if(href_list["search"])
matching_designs.Cut()
@@ -35,7 +35,7 @@
return
if(slot != SLOT_GLASSES)
return
RegisterSignal(user, COMSIG_COMBAT_TOGGLED, .proc/injectadrenaline)
RegisterSignal(user, COMSIG_COMBAT_TOGGLED,PROC_REF(injectadrenaline))
/obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
. = ..()
@@ -89,7 +89,7 @@
bad_snowflake.pixel_x = -16
k9_models["Alina"] = bad_snowflake
k9_models = sortList(k9_models)
var/k9_borg_icon = show_radial_menu(R, R , k9_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/k9_borg_icon = show_radial_menu(R, R , k9_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!k9_borg_icon)
return
switch(k9_borg_icon)
@@ -162,7 +162,7 @@
bad_snowflake.pixel_x = -16
medihound_models["Alina"] = bad_snowflake
medihound_models = sortList(medihound_models)
var/medihound_borg_icon = show_radial_menu(R, R , medihound_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/medihound_borg_icon = show_radial_menu(R, R , medihound_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!medihound_borg_icon)
return
switch(medihound_borg_icon)
@@ -216,7 +216,7 @@
scrubpup_models = list(
"scrubpup" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "scrubpup")
)
var/scrubpup_borg_icon = show_radial_menu(R, R , scrubpup_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/scrubpup_borg_icon = show_radial_menu(R, R , scrubpup_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!scrubpup_borg_icon)
return
switch(scrubpup_borg_icon)
@@ -317,7 +317,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_medical")
)
med_models = sortList(med_models)
var/medi_borg_icon = show_radial_menu(R, R , med_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/medi_borg_icon = show_radial_menu(R, R , med_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!medi_borg_icon)
return
switch(medi_borg_icon)
@@ -376,7 +376,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyjanitorS")
)
jani_models = sortList(jani_models)
var/jani_borg_icon = show_radial_menu(R, R , jani_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/jani_borg_icon = show_radial_menu(R, R , jani_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!jani_borg_icon)
return
switch(jani_borg_icon)
@@ -421,7 +421,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_peacekeeper")
)
peace_models = sortList(peace_models)
var/peace_borg_icon = show_radial_menu(R, R , peace_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/peace_borg_icon = show_radial_menu(R, R , peace_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!peace_borg_icon)
return
switch(peace_borg_icon)
@@ -466,7 +466,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_security")
)
sec_models = sortList(sec_models)
var/sec_borg_icon = show_radial_menu(R, R , sec_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/sec_borg_icon = show_radial_menu(R, R , sec_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!sec_borg_icon)
return
switch(sec_borg_icon)
@@ -528,7 +528,7 @@
"Busty" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "busty_service")
)
butler_models = sortList(butler_models)
var/butler_borg_icon = show_radial_menu(R, R , butler_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/butler_borg_icon = show_radial_menu(R, R , butler_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!butler_borg_icon)
return
switch(butler_borg_icon)
@@ -605,7 +605,7 @@
bad_snowflake.pixel_x = -16
eng_models["Alina"] = bad_snowflake*/ //removes pupdozer,engihound (this option doesn't work anyways)
eng_models = sortList(eng_models)
var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!eng_borg_icon)
return
switch(eng_borg_icon)
@@ -699,7 +699,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_mining")
)
miner_models = sortList(miner_models)
var/miner_borg_icon = show_radial_menu(R, R , miner_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/miner_borg_icon = show_radial_menu(R, R , miner_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!miner_borg_icon)
return
switch(miner_borg_icon)
@@ -756,7 +756,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootystandardS")
)
stand_models = sortList(stand_models)
var/stand_borg_icon = show_radial_menu(R, R , stand_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/stand_borg_icon = show_radial_menu(R, R , stand_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!stand_borg_icon)
return
switch(stand_borg_icon)
@@ -787,7 +787,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootystandardS")
)
clown_models = sortList(clown_models)
var/clown_borg_icon = show_radial_menu(R, R , clown_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/clown_borg_icon = show_radial_menu(R, R , clown_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!clown_borg_icon)
return
switch(clown_borg_icon)
@@ -39,14 +39,14 @@
/obj/item/clothing/head/hattip/equipped(mob/M, slot)
. = ..()
if (slot == SLOT_HEAD)
RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
RegisterSignal(M, COMSIG_MOB_SAY,PROC_REF(handle_speech))
else
UnregisterSignal(M, COMSIG_MOB_SAY)
/obj/item/clothing/head/hattip/dropped(mob/M)
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
addtimer(CALLBACK(GLOBAL_PROC, .proc/root_and_toot, src, src, 200))
addtimer(CALLBACK(PROC_REF(root_and_toot), src, src, 200))
/obj/item/clothing/head/hattip/proc/root_and_toot(obj/item/clothing/head/hattip/hat)
hat.animate_atom_living()
@@ -301,7 +301,7 @@
// Setup the autotransfer checks if needed
if(transferlocation != null && autotransferchance > 0)
addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly/,check_autotransfer), prey), autotransferwait)
/obj/belly/proc/check_autotransfer(var/mob/prey, var/obj/belly/target)
// Some sanity checks
@@ -310,7 +310,7 @@
transfer_contents(prey, transferlocation)
else
// Didn't transfer, so wait before retrying
addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly/,check_autotransfer), prey), autotransferwait)
//Transfers contents from one belly to another
/obj/belly/proc/transfer_contents(var/atom/movable/content, var/obj/belly/target, silent = FALSE)
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums)
//Write it out
//#ifdef RUST_G
// call(RUST_G, "file_write")(json_to_file, path)
// LIBCALL(RUST_G, "file_write")(json_to_file, path)
//#else
// Fall back to using old format if we are not using rust-g
if(fexists(path))