mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-09 07:02:15 +01:00
more stuff
This commit is contained in:
+1
-1
@@ -30,7 +30,7 @@
|
||||
icon_state = beam_icon_state
|
||||
beam_type = btype
|
||||
if(time < INFINITY)
|
||||
addtimer(CALLBACK(src,.proc/End), time)
|
||||
addtimer(CALLBACK(src, PROC_REF(End)), time)
|
||||
|
||||
/datum/beam/proc/Start()
|
||||
Draw()
|
||||
|
||||
@@ -66,17 +66,17 @@
|
||||
if(can_user_rotate)
|
||||
src.can_user_rotate = can_user_rotate
|
||||
else
|
||||
src.can_user_rotate = CALLBACK(src,.proc/default_can_user_rotate)
|
||||
src.can_user_rotate = CALLBACK(src, PROC_REF(default_can_user_rotate))
|
||||
|
||||
if(can_be_rotated)
|
||||
src.can_be_rotated = can_be_rotated
|
||||
else
|
||||
src.can_be_rotated = CALLBACK(src,.proc/default_can_be_rotated)
|
||||
src.can_be_rotated = CALLBACK(src, PROC_REF(default_can_be_rotated))
|
||||
|
||||
if(after_rotation)
|
||||
src.after_rotation = after_rotation
|
||||
else
|
||||
src.after_rotation = CALLBACK(src,.proc/default_after_rotation)
|
||||
src.after_rotation = CALLBACK(src, PROC_REF(default_after_rotation))
|
||||
|
||||
//Try Clockwise,counter,flip in order
|
||||
if(src.rotation_flags & ROTATION_FLIP)
|
||||
|
||||
@@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
|
||||
GLOB.doppler_arrays += src
|
||||
|
||||
/obj/machinery/doppler_array/ComponentInitialize()
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,.proc/rot_message))
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src, PROC_REF(rot_message)))
|
||||
|
||||
/obj/machinery/doppler_array/Destroy()
|
||||
GLOB.doppler_arrays -= src
|
||||
|
||||
@@ -853,7 +853,7 @@ GLOBAL_LIST_EMPTY(allCasters)
|
||||
say("Breaking news from [channel]!")
|
||||
alert = TRUE
|
||||
update_icon()
|
||||
addtimer(CALLBACK(src,.proc/remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)
|
||||
addtimer(CALLBACK(src, PROC_REF(remove_alert)),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)
|
||||
playsound(loc, 'sound/machines/twobeep.ogg', 75, 1)
|
||||
else
|
||||
say("Attention! Wanted issue distributed!")
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
M.dust()
|
||||
playsound(src, 'sound/mecha/neovgre_exploding.ogg', 100, 0)
|
||||
src.visible_message("<span class = 'userdanger'>The reactor has gone critical, its going to blow!</span>")
|
||||
addtimer(CALLBACK(src,.proc/go_critical),breach_time)
|
||||
addtimer(CALLBACK(src, PROC_REF(go_critical)),breach_time)
|
||||
|
||||
/obj/mecha/combat/neovgre/proc/go_critical()
|
||||
explosion(get_turf(loc), 3, 5, 10, 20, 30)
|
||||
@@ -86,4 +86,4 @@
|
||||
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/neovgre/can_attach(obj/mecha/combat/neovgre/M)
|
||||
if(istype(M))
|
||||
return 1
|
||||
return 0
|
||||
return 0
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
/obj/structure/c_transit_tube/ComponentInitialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src,.proc/after_rot))
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src, PROC_REF(after_rot)))
|
||||
|
||||
/obj/structure/c_transit_tube/proc/after_rot(mob/user,rotation_type)
|
||||
if(flipped_build_type && rotation_type == ROTATION_FLIP)
|
||||
|
||||
@@ -320,7 +320,7 @@
|
||||
ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS,
|
||||
null,
|
||||
CALLBACK(src,PROC_REF(can_be_rotated)),
|
||||
CALLBACK(src,.proc/after_rotation)
|
||||
CALLBACK(src, PROC_REF(after_rotation))
|
||||
)
|
||||
|
||||
/obj/structure/windoor_assembly/proc/can_be_rotated(mob/user,rotation_type)
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
/obj/structure/window/ComponentInitialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src,PROC_REF(can_be_rotated),CALLBACK(src,.proc/after_rotation)))
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src,PROC_REF(can_be_rotated),CALLBACK(src, PROC_REF(after_rotation))))
|
||||
|
||||
/obj/structure/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
|
||||
switch(the_rcd.mode)
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
/datum/antagonist/abductor/get_admin_commands()
|
||||
. = ..()
|
||||
.["Equip"] = CALLBACK(src,.proc/admin_equip)
|
||||
.["Equip"] = CALLBACK(src, PROC_REF(admin_equip))
|
||||
|
||||
/datum/antagonist/abductor/proc/admin_equip(mob/admin)
|
||||
if(!ishuman(owner.current))
|
||||
|
||||
@@ -479,7 +479,7 @@
|
||||
/datum/antagonist/changeling/get_admin_commands()
|
||||
. = ..()
|
||||
if(stored_profiles.len && (owner.current.real_name != first_prof.name))
|
||||
.["Transform to initial appearance."] = CALLBACK(src,.proc/admin_restore_appearance)
|
||||
.["Transform to initial appearance."] = CALLBACK(src, PROC_REF(admin_restore_appearance))
|
||||
|
||||
/datum/antagonist/changeling/proc/admin_restore_appearance(mob/admin)
|
||||
if(!stored_profiles.len || !iscarbon(owner.current))
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
/obj/structure/destructible/clockwork/reflector/ComponentInitialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src,PROC_REF(can_be_rotated),CALLBACK(src,.proc/after_rotation)))
|
||||
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src,PROC_REF(can_be_rotated),CALLBACK(src, PROC_REF(after_rotation))))
|
||||
|
||||
/obj/structure/destructible/clockwork/reflector/bullet_act(obj/item/projectile/P)
|
||||
if(!anchored || !allowed_projectile_typecache[P.type] || !(P.dir in GLOB.cardinals))
|
||||
@@ -83,4 +83,4 @@
|
||||
anchored = !anchored
|
||||
to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] \the [src].</span>")
|
||||
I.play_tool_sound(src)
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
@@ -192,7 +192,7 @@
|
||||
|
||||
/datum/antagonist/clockcult/get_admin_commands()
|
||||
. = ..()
|
||||
.["Give slab"] = CALLBACK(src,.proc/admin_give_slab)
|
||||
.["Give slab"] = CALLBACK(src, PROC_REF(admin_give_slab))
|
||||
|
||||
/datum/antagonist/clockcult/proc/admin_give_slab(mob/admin)
|
||||
if(!SSticker.mode.equip_servant(owner.current))
|
||||
|
||||
@@ -171,8 +171,8 @@
|
||||
|
||||
/datum/antagonist/cult/get_admin_commands()
|
||||
. = ..()
|
||||
.["Dagger"] = CALLBACK(src,.proc/admin_give_dagger)
|
||||
.["Dagger and Metal"] = CALLBACK(src,.proc/admin_give_metal)
|
||||
.["Dagger"] = CALLBACK(src, PROC_REF(admin_give_dagger))
|
||||
.["Dagger and Metal"] = CALLBACK(src, PROC_REF(admin_give_metal))
|
||||
|
||||
/datum/antagonist/cult/proc/admin_give_dagger(mob/admin)
|
||||
if(!equip_cultist(FALSE))
|
||||
|
||||
@@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
|
||||
|
||||
/datum/antagonist/devil/get_admin_commands()
|
||||
. = ..()
|
||||
.["Toggle ascendable"] = CALLBACK(src,.proc/admin_toggle_ascendable)
|
||||
.["Toggle ascendable"] = CALLBACK(src, PROC_REF(admin_toggle_ascendable))
|
||||
|
||||
|
||||
/datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin)
|
||||
|
||||
@@ -126,8 +126,8 @@
|
||||
|
||||
/datum/antagonist/nukeop/get_admin_commands()
|
||||
. = ..()
|
||||
.["Send to base"] = CALLBACK(src,.proc/admin_send_to_base)
|
||||
.["Tell code"] = CALLBACK(src,.proc/admin_tell_code)
|
||||
.["Send to base"] = CALLBACK(src, PROC_REF(admin_send_to_base))
|
||||
.["Tell code"] = CALLBACK(src, PROC_REF(admin_tell_code))
|
||||
|
||||
/datum/antagonist/nukeop/proc/admin_send_to_base(mob/admin)
|
||||
owner.current.forceMove(pick(GLOB.nukeop_start))
|
||||
|
||||
@@ -84,8 +84,8 @@
|
||||
|
||||
/datum/antagonist/overthrow/get_admin_commands()
|
||||
. = ..()
|
||||
.["Give storage with random item"] = CALLBACK(src,.proc/equip_overthrow)
|
||||
.["Give overthrow boss equip"] = CALLBACK(src,.proc/equip_initial_overthrow_agent)
|
||||
.["Give storage with random item"] = CALLBACK(src, PROC_REF(equip_overthrow))
|
||||
.["Give overthrow boss equip"] = CALLBACK(src, PROC_REF(equip_initial_overthrow_agent))
|
||||
|
||||
// Dynamically creates the HUD for the team if it doesn't exist already, inserting it into the global huds list, and assigns it to the user. The index is saved into a var owned by the team datum.
|
||||
/datum/antagonist/overthrow/proc/update_overthrow_icons_added(datum/mind/traitor_mind)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
target.team = src
|
||||
target.find_target()
|
||||
objectives += target
|
||||
addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(update_objectives)),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
|
||||
|
||||
/datum/team/overthrow/proc/update_objectives()
|
||||
var/datum/objective/overthrow/heads/heads_obj = locate() in objectives
|
||||
@@ -38,4 +38,4 @@
|
||||
M.objectives += heads_obj
|
||||
heads_obj.find_targets()
|
||||
|
||||
addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(update_objectives)),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
/datum/antagonist/rev/get_admin_commands()
|
||||
. = ..()
|
||||
.["Promote"] = CALLBACK(src,.proc/admin_promote)
|
||||
.["Promote"] = CALLBACK(src, PROC_REF(admin_promote))
|
||||
|
||||
/datum/antagonist/rev/proc/admin_promote(mob/admin)
|
||||
var/datum/mind/O = owner
|
||||
@@ -105,10 +105,10 @@
|
||||
/datum/antagonist/rev/head/get_admin_commands()
|
||||
. = ..()
|
||||
. -= "Promote"
|
||||
.["Take flash"] = CALLBACK(src,.proc/admin_take_flash)
|
||||
.["Give flash"] = CALLBACK(src,.proc/admin_give_flash)
|
||||
.["Repair flash"] = CALLBACK(src,.proc/admin_repair_flash)
|
||||
.["Demote"] = CALLBACK(src,.proc/admin_demote)
|
||||
.["Take flash"] = CALLBACK(src, PROC_REF(admin_take_flash))
|
||||
.["Give flash"] = CALLBACK(src, PROC_REF(admin_give_flash))
|
||||
.["Repair flash"] = CALLBACK(src, PROC_REF(admin_repair_flash))
|
||||
.["Demote"] = CALLBACK(src, PROC_REF(admin_demote))
|
||||
|
||||
/datum/antagonist/rev/head/proc/admin_take_flash(mob/admin)
|
||||
var/list/L = owner.current.get_contents()
|
||||
@@ -267,7 +267,7 @@
|
||||
for(var/datum/mind/M in members)
|
||||
M.objectives |= objectives
|
||||
|
||||
addtimer(CALLBACK(src,.proc/update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(update_objectives)),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
|
||||
|
||||
/datum/team/revolution/proc/head_revolutionaries()
|
||||
. = list()
|
||||
@@ -293,7 +293,7 @@
|
||||
var/datum/antagonist/rev/rev = new_leader.has_antag_datum(/datum/antagonist/rev)
|
||||
rev.promote()
|
||||
|
||||
addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(update_heads)),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
|
||||
|
||||
|
||||
/datum/team/revolution/roundend_report()
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
/datum/antagonist/wizard/get_admin_commands()
|
||||
. = ..()
|
||||
.["Send to Lair"] = CALLBACK(src,.proc/admin_send_to_lair)
|
||||
.["Send to Lair"] = CALLBACK(src, PROC_REF(admin_send_to_lair))
|
||||
|
||||
/datum/antagonist/wizard/proc/admin_send_to_lair(mob/admin)
|
||||
owner.current.forceMove(pick(GLOB.wizardstart))
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,
|
||||
null,
|
||||
null,
|
||||
CALLBACK(src,.proc/after_rotation)
|
||||
CALLBACK(src, PROC_REF(after_rotation))
|
||||
)
|
||||
|
||||
/obj/item/assembly/infra/proc/after_rotation()
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
threat.title = "Business proposition"
|
||||
threat.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank."
|
||||
threat.possible_answers = list("We'll pay.","No way.")
|
||||
threat.answer_callback = CALLBACK(src,.proc/answered)
|
||||
threat.answer_callback = CALLBACK(src, PROC_REF(answered))
|
||||
SScommunications.send_message(threat,unique = TRUE)
|
||||
|
||||
/datum/round_event/pirates/proc/answered()
|
||||
@@ -206,7 +206,7 @@
|
||||
. = ..()
|
||||
if(. == DOCKING_SUCCESS && !is_reserved_level(new_dock.z))
|
||||
engines_cooling = TRUE
|
||||
addtimer(CALLBACK(src,.proc/reset_cooldown),engine_cooldown,TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(reset_cooldown)),engine_cooldown,TIMER_UNIQUE)
|
||||
|
||||
/obj/docking_port/mobile/pirate/proc/reset_cooldown()
|
||||
engines_cooling = FALSE
|
||||
@@ -379,7 +379,7 @@
|
||||
status_report = "Sending..."
|
||||
pad.visible_message("<span class='notice'>[pad] starts charging up.</span>")
|
||||
pad.icon_state = pad.warmup_state
|
||||
sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE)
|
||||
sending_timer = addtimer(CALLBACK(src, PROC_REF(send)),warmup_time, TIMER_STOPPABLE)
|
||||
|
||||
/obj/machinery/computer/piratepad_control/proc/stop_sending()
|
||||
if(!sending)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
/obj/item/greentext/Initialize(mapload)
|
||||
. = ..()
|
||||
GLOB.poi_list |= src
|
||||
roundend_callback = CALLBACK(src,.proc/check_winner)
|
||||
roundend_callback = CALLBACK(src, PROC_REF(check_winner))
|
||||
SSticker.OnRoundend(roundend_callback)
|
||||
|
||||
/obj/item/greentext/equipped(mob/living/user as mob)
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
/mob/living/simple_animal/hostile/handle_automated_movement()
|
||||
. = ..()
|
||||
if(dodging && target && in_melee && isturf(loc) && isturf(target.loc))
|
||||
var/datum/cb = CALLBACK(src,.proc/sidestep)
|
||||
var/datum/cb = CALLBACK(src, PROC_REF(sidestep))
|
||||
if(sidestep_per_cycle > 1) //For more than one just spread them equally - this could changed to some sensible distribution later
|
||||
var/sidestep_delay = SSnpcpool.wait / sidestep_per_cycle
|
||||
for(var/i in 1 to sidestep_per_cycle)
|
||||
|
||||
@@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
|
||||
if(SSpersistence.initialized)
|
||||
UpdateInfo()
|
||||
else
|
||||
SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateInfo))
|
||||
SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateInfo)))
|
||||
|
||||
/obj/item/paper/secretrecipe/proc/UpdateInfo()
|
||||
var/datum/chemical_reaction/recipe = get_chemical_reaction(recipe_id)
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
// Admin commands
|
||||
/datum/antagonist/gang/get_admin_commands()
|
||||
. = ..()
|
||||
.["Promote"] = CALLBACK(src,.proc/admin_promote)
|
||||
.["Promote"] = CALLBACK(src, PROC_REF(admin_promote))
|
||||
.["Set Influence"] = CALLBACK(src,PROC_REF(admin_adjust_influence))
|
||||
if(gang.domination_time != NOT_DOMINATING)
|
||||
.["Set domination time left"] = CALLBACK(src,PROC_REF(set_dom_time_left))
|
||||
@@ -241,9 +241,9 @@
|
||||
/datum/antagonist/gang/boss/get_admin_commands()
|
||||
. = ..()
|
||||
. -= "Promote"
|
||||
.["Take gangtool"] = CALLBACK(src,.proc/admin_take_gangtool)
|
||||
.["Give gangtool"] = CALLBACK(src,.proc/admin_give_gangtool)
|
||||
.["Demote"] = CALLBACK(src,.proc/admin_demote)
|
||||
.["Take gangtool"] = CALLBACK(src, PROC_REF(admin_take_gangtool))
|
||||
.["Give gangtool"] = CALLBACK(src, PROC_REF(admin_give_gangtool))
|
||||
.["Demote"] = CALLBACK(src, PROC_REF(admin_demote))
|
||||
|
||||
/datum/antagonist/gang/boss/proc/demote()
|
||||
var/old_gang = gang
|
||||
@@ -474,4 +474,4 @@
|
||||
|
||||
|
||||
#undef MAXIMUM_RECALLS
|
||||
#undef INFLUENCE_INTERVAL
|
||||
#undef INFLUENCE_INTERVAL
|
||||
|
||||
Reference in New Issue
Block a user