cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 21:16:16 +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
modular_citadel/code/datums/wires/autoylathe.dm
+3 -3
View File
@@ -27,13 +27,13 @@
switch(wire)
if(WIRE_HACK)
A.adjust_hacked(!A.hacked)
addtimer(CALLBACK(A, /obj/machinery/autoylathe.proc/reset, wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autoylathe, reset), wire), 60)
if(WIRE_SHOCK)
A.shocked = !A.shocked
addtimer(CALLBACK(A, /obj/machinery/autoylathe.proc/reset, wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autoylathe, reset), wire), 60)
if(WIRE_DISABLE)
A.disabled = !A.disabled
addtimer(CALLBACK(A, /obj/machinery/autoylathe.proc/reset, wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autoylathe, reset), wire), 60)
/datum/wires/autoylathe/on_cut(wire, mend)
var/obj/machinery/autoylathe/A = holder
modular_citadel/code/game/gamemodes/gangs/gang.dm
+5 -5
View File
@@ -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
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+1 -1
View File
@@ -320,7 +320,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
if(R && !R.pounce_cooldown)
R.pounce_cooldown = !R.pounce_cooldown
to_chat(R, "<span class ='warning'>Your targeting systems lock on to [A]...</span>")
addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
addtimer(CALLBACK(R, TYPE_PROC_REF(/mob/living/silicon/robot, leap_at), A), R.pounce_spoolup)
spawn(R.pounce_cooldown_time)
R.pounce_cooldown = !R.pounce_cooldown
else if(R && R.pounce_cooldown)