diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 942f2f7c9a7..8f30b04f091 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1403,8 +1403,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) **/ #define NAMEOF(datum, X) (#X || ##datum.##X) -<<<<<<< HEAD -======= /** * NAMEOF that actually works in static definitions because src::type requires src to be defined */ @@ -1414,7 +1412,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) #define NAMEOF_STATIC(datum, X) (#X || ##datum.##X) #endif ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b #define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value) //dupe code because dm can't handle 3 level deep macros #define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 802fd300991..cf511e3f923 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -47,11 +47,7 @@ var/datum/config_entry/catched = src if(!istype(catched)) return -<<<<<<< HEAD - var/static/list/banned_edits = list(NAMEOF(catched, name), NAMEOF(catched, vv_VAS), NAMEOF(catched, default), NAMEOF(catched, resident_file), NAMEOF(catched, protection), NAMEOF(catched, abstract_type), NAMEOF(catched, modified), NAMEOF(catched, dupes_allowed)) -======= var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed)) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b if(var_name == NAMEOF(src, config_entry_value)) if(protection & CONFIG_ENTRY_LOCKED) return FALSE @@ -120,11 +116,7 @@ var/datum/config_entry/number/catched = src if(!istype(catched)) return -<<<<<<< HEAD - var/static/list/banned_edits = list(NAMEOF(catched, max_val), NAMEOF(catched, min_val), NAMEOF(catched, integer)) -======= var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer)) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b return !(var_name in banned_edits) && ..() /datum/config_entry/flag diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 2375ab8f8c0..ede5a8724f6 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -315,11 +315,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //(higher subsystems will be sooner in the queue, adding them later in the loop means we don't have to loop thru them next queue add) sortTim(tickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority)) for(var/I in runlevel_sorted_subsystems) -<<<<<<< HEAD - sortTim(runlevel_sorted_subsystems, GLOBAL_PROC_REF(cmp_subsystem_priority)) -======= sortTim(I, GLOBAL_PROC_REF(cmp_subsystem_priority)) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b I += tickersubsystems var/cached_runlevel = current_runlevel diff --git a/code/datums/skills/_skill_modifier.dm b/code/datums/skills/_skill_modifier.dm index a4d933a60e7..6097c2fe8d1 100644 --- a/code/datums/skills/_skill_modifier.dm +++ b/code/datums/skills/_skill_modifier.dm @@ -115,13 +115,8 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill) skill_holder.need_static_data_update = TRUE if(M.modifier_flags & MODIFIER_SKILL_BODYBOUND) -<<<<<<< HEAD - M.RegisterSignal(src, COMSIG_MIND_TRANSFER, /datum/skill_modifier.proc/on_mind_transfer) - M.RegisterSignal(current, COMSIG_MOB_ON_NEW_MIND, /datum/skill_modifier.proc/on_mob_new_mind, TRUE) -======= M.RegisterSignal(src, COMSIG_MIND_TRANSFER, TYPE_PROC_REF(/datum/skill_modifier,on_mind_transfer)) M.RegisterSignal(current, COMSIG_MOB_ON_NEW_MIND, TYPE_PROC_REF(/datum/skill_modifier,on_mob_new_mind), TRUE) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b RegisterSignal(M, COMSIG_PARENT_PREQDELETED, PROC_REF(on_skill_modifier_deletion)) #undef ADD_MOD_STEP diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d2e1c575424..071a6229f10 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -716,11 +716,7 @@ GENETICS SCANNER else to_chat(user, span_warning("[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].")) cooldown = TRUE -<<<<<<< HEAD - addtimer(CALLBACK(src,TYPE_PROC_REF(/obj/item/analyzer, ping)), cooldown_time) -======= addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/analyzer, ping)), cooldown_time) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b /obj/item/analyzer/proc/ping() if(isliving(loc)) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 4b78a7fb507..94b1734a864 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -15,11 +15,7 @@ /obj/structure/statue/Initialize() . = ..() AddElement(/datum/element/art, impressiveness) -<<<<<<< HEAD - addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, impressiveness * 75)), 0) -======= addtimer(CALLBACK(src, TYPE_PROC_REF(/datum,_AddElement), list(/datum/element/beauty, impressiveness * 75)), 0) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)), CALLBACK(src, PROC_REF(can_be_rotated)), null) /obj/structure/statue/proc/can_be_rotated(mob/user) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 84ba956deab..96c1dd7a7e4 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -268,11 +268,7 @@ SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50)) var/image/C = image('icons/effects/cult_effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, FALSE) -<<<<<<< HEAD - addtimer(CALLBACK(H,TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) -======= addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b to_chat(ranged_ability_user,"[H] has been cursed with living nightmares!") attached_action.charges-- attached_action.desc = attached_action.base_desc diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index bb56bb21531..9656757b05e 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -994,11 +994,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/image/A = image('icons/mob/mob.dmi',M,"cultist", ABOVE_MOB_LAYER) A.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, FALSE) -<<<<<<< HEAD - addtimer(CALLBACK(M,TYPE_PROC_REF(/atom, remove_alt_appearance),"human_apoc",TRUE), duration) -======= addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"human_apoc",TRUE), duration) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b images += A SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/spookoween/ghost_whisper.ogg'),sound('sound/spookoween/ghosty_wind.ogg'))) else @@ -1006,21 +1002,13 @@ structure_check() searches for nearby cultist structures required for the invoca var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER) B.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, FALSE) -<<<<<<< HEAD - addtimer(CALLBACK(M,TYPE_PROC_REF(/atom, remove_alt_appearance),"mob_apoc",TRUE), duration) -======= addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"mob_apoc",TRUE), duration) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b images += B if(!iscultist(M)) if(M.client) var/image/C = image('icons/effects/cult_effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, FALSE) -<<<<<<< HEAD - addtimer(CALLBACK(M,TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), duration) -======= addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), duration) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b images += C else to_chat(M, span_cultlarge("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 712945595d3..4bfa7edc221 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -492,11 +492,7 @@ SSticker.roundend_check_paused = FALSE /obj/machinery/nuclearbomb/proc/really_actually_explode(off_station) -<<<<<<< HEAD - Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,TYPE_PROC_REF(/datum/controller/subsystem/ticker, station_explosion_detonation),src)) -======= Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker, station_explosion_detonation),src)) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b INVOKE_ASYNC(GLOBAL_PROC,GLOBAL_PROC_REF(KillEveryoneOnZLevel), z) /obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 514f2edf3c9..e73816cbef8 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -266,11 +266,7 @@ GLOBAL_PROTECT(exp_to_update) "ckey" = ckey, "minutes" = jvalue))) prefs.exp[jtype] += jvalue -<<<<<<< HEAD - addtimer(CALLBACK(SSblackbox,TYPE_PROC_REF(/datum/controller/subsystem/blackbox, update_exp_db)),20,TIMER_OVERRIDE|TIMER_UNIQUE) -======= addtimer(CALLBACK(SSblackbox, TYPE_PROC_REF(/datum/controller/subsystem/blackbox, update_exp_db)),20,TIMER_OVERRIDE|TIMER_UNIQUE) ->>>>>>> 13cccaee54b8654ff6595b05dc923dfae758734b //ALWAYS call this at beginning to any proc touching player flags, or your database admin will probably be mad