cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-19 20:07:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from deertools/515-compatiblity

Browse Source 
More 515 updates
This commit is contained in:
evilew
2024-03-29 17:38:48 +01:00
committed by GitHub
parent 472b51194f eb06cb3364
commit ea7a7a8281
111 changed files with 206 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/buttons.dm
+1 -1
View File
@@ -167,7 +167,7 @@
if(device)
device.pulsed()
addtimer(CALLBACK(src, /atom/.proc/update_icon), 15)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_icon)), 15)
/obj/machinery/button/power_change()
..()
code/game/machinery/doors/airlock.dm
+3 -3
View File
@@ -114,7 +114,7 @@
set_frequency(frequency)
if(closeOtherId != null)
addtimer(CALLBACK(.proc/update_other_id), 5)
addtimer(CALLBACK(PROC_REF(update_other_id)), 5)
if(glass)
airlock_material = "glass"
if(security_level > AIRLOCK_SECURITY_METAL)
@@ -1107,11 +1107,11 @@
if(!beingcrowbarred) //being fireaxe'd
var/obj/item/twohanded/fireaxe/F = I
if(F.wielded)
INVOKE_ASYNC(src, (density ? .proc/open :PROC_REF(close)), 2)
INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
else
to_chat(user, "<span class='warning'>You need to be wielding the fire axe to do that!</span>")
else
INVOKE_ASYNC(src, (density ? .proc/open :PROC_REF(close)), 2)
INVOKE_ASYNC(src, (density ? PROC_REF(open) :PROC_REF(close)), 2)
if(istype(I, /obj/item/crowbar/power))
if(isElectrified())
code/game/machinery/doppler_array.dm
+1 -1
View File
@@ -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
code/game/machinery/embedded_controller/embedded_controller_base.dm
+1 -1
View File
@@ -50,7 +50,7 @@
if(program)
program.receive_user_command(href_list["command"])
addtimer(CALLBACK(program, /datum/computer/file/embedded_program.proc/process), 5)
addtimer(CALLBACK(program, TYPE_PROC_REF(/datum/computer/file/embedded_program, process)), 5)
usr.set_machine(src)
addtimer(CALLBACK(src,PROC_REF(updateDialog)), 5)
code/game/machinery/hologram.dm
+1 -1
View File
@@ -637,7 +637,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(HOLORECORD_SOUND)
playsound(src,entry[2],50,1)
if(HOLORECORD_DELAY)
addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2])
addtimer(CALLBACK(src,PROC_REF(replay_entry),entry_number+1),entry[2])
return
if(HOLORECORD_LANGUAGE)
var/datum/language_holder/holder = replay_holo.get_language_holder()
code/game/machinery/newscaster.dm
+1 -1
View File
@@ -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!")
code/game/mecha/combat/neovgre.dm
+2 -2
View File
@@ -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
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -350,7 +350,7 @@
var/turf/T = get_turf(src)
message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]")
log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]")
addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/prime), det_time)
addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, prime)), det_time)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
name = "\improper SOB-3 grenade launcher"
code/game/objects/effects/temporary_visuals/miscellaneous.dm
+1 -1
View File
@@ -464,7 +464,7 @@
status = rcd_status
delay = rcd_delay
if (status == RCD_DECONSTRUCT)
addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_icon)), 11)
delay -= 11
icon_state = "rcd_end_reverse"
else
code/game/objects/items/RCD.dm
+1 -1
View File
@@ -453,7 +453,7 @@ RLD
choices += list(
"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
)
var/choice = show_radial_menu(user,src,choices, custom_check = CALLBACK(src,.proc/check_menu,user))
var/choice = show_radial_menu(user,src,choices, custom_check = CALLBACK(src,PROC_REF(check_menu),user))
if(!check_menu(user))
return
switch(choice)
code/game/objects/structures/divine.dm
+1 -1
View File
@@ -41,7 +41,7 @@
to_chat(user, "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>")
user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
update_icon()
addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_icon)), time_between_uses)
/obj/structure/healingfountain/update_icon()
code/game/objects/structures/electricchair.dm
+1 -1
View File
@@ -42,5 +42,5 @@
var/mob/living/buckled_mob = m
buckled_mob.electrocute_act(85, src, 1)
to_chat(buckled_mob, "<span class='userdanger'>You feel a deep shock course through your body!</span>")
addtimer(CALLBACK(buckled_mob, /mob/living.proc/electrocute_act, 85, src, 1), 1)
addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 85, src, 1), 1)
visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='italics'>You hear a deep sharp shock!</span>")
code/game/objects/structures/ghost_role_spawners.dm
+1 -1
View File
@@ -423,7 +423,7 @@
id.update_label()
else
to_chat(L, "<span class='userdanger'>Your owner is already dead! You will soon perish.</span>")
addtimer(CALLBACK(L, /mob.proc/dust, 150)) //Give em a few seconds as a mercy.
addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, dust), 150)) //Give em a few seconds as a mercy.
/datum/outfit/demonic_friend
name = "Demonic Friend"
code/game/objects/structures/guillotine.dm
+2 -2
View File
@@ -133,7 +133,7 @@
for(var/mob/M in viewers(src, 7))
var/mob/living/carbon/human/C = M
if (ishuman(M))
addtimer(CALLBACK(C, /mob/.proc/emote, "clap"), delay_offset * 0.3)
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/, emote), "clap"), delay_offset * 0.3)
delay_offset++
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
@@ -256,4 +256,4 @@
#undef GUILLOTINE_ACTIVATE_DELAY
#undef GUILLOTINE_WRENCH_DELAY
#undef GUILLOTINE_ACTION_INUSE
#undef GUILLOTINE_ACTION_WRENCH
#undef GUILLOTINE_ACTION_WRENCH
code/game/objects/structures/manned_turret.dm
+1 -1
View File
@@ -142,7 +142,7 @@
/obj/machinery/manned_turret/proc/volley(mob/user)
target_turf = get_turf(target)
for(var/i in 1 to number_of_shots)
addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/manned_turret/, fire_helper), user), i*rate_of_fire)
/obj/machinery/manned_turret/proc/fire_helper(mob/user)
if(user.incapacitated() || !(user in buckled_mobs))
code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/windoor_assembly.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/window.dm
+1 -1
View File
@@ -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)
code/game/turfs/open.dm
+1 -1
View File
@@ -343,7 +343,7 @@
lube |= SLIDE_ICE
if(lube&SLIDE)
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, /mob/living/carbon/.proc/spin, 1, 1))
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon/, spin), 1, 1))
else if(lube&SLIDE_ICE)
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir
return 1
code/game/turfs/turf.dm
+1 -1
View File
@@ -365,7 +365,7 @@
var/list/things = src_object.contents()
var/datum/progressbar/progress = new(user, things.len, src)
while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /datum/component/storage.proc/mass_remove_from_storage, src, things, progress)))
while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress)))
stoplag(1)
qdel(progress)