cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

More 515 Compatibility

Browse Source
This commit is contained in:
Heroman3003
2023-06-06 07:14:58 +10:00
committed by CHOMPStation2
parent 3129a35fe2
commit 2281afdf24
142 changed files with 507 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm
View File

@@ -182,7 +182,7 @@
if(!QDELING(src) && !holds_charge)
// Put it on a delay because moving item from slot to hand
// calls dropped().
addtimer(CALLBACK(src, .proc/empty_if_not_held), 2)
addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 2)
/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty_if_not_held()
if(!ismob(loc) && !istype(loc, /obj/item/integrated_circuit))
@@ -206,7 +206,7 @@
var/carried = max(1, loc.ConflictElementCount(CONFLICT_ELEMENT_KA))
deltimer(recharge_timerid)
recharge_timerid = addtimer(CALLBACK(src, .proc/reload), recharge_time * carried, TIMER_STOPPABLE)
recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE)
/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
return

7
code/modules/projectiles/guns/projectile/smartgun.dm
View File

@@ -34,7 +34,7 @@
var/image/I = ..()
if(I)
I.pixel_x = -16
return I
return I
/obj/item/weapon/gun/projectile/smartgun/loaded
magazine_type = /obj/item/ammo_magazine/smartgun
@@ -68,7 +68,7 @@
return
cycling = TRUE
if(closed)
icon_state = "[initial(icon_state)]_open"
playsound(src, 'sound/weapons/smartgunopen.ogg', 75, 0)
@@ -77,7 +77,7 @@
icon_state = "[initial(icon_state)]_closed"
playsound(src, 'sound/weapons/smartgunclose.ogg', 75, 0)
to_chat(user, "<span class='notice'>You ready [src] so that it can be fired.</span>")
addtimer(CALLBACK(src, .proc/toggle_real_state), 2 SECONDS, TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(toggle_real_state)), 2 SECONDS, TIMER_UNIQUE)
/obj/item/weapon/gun/projectile/smartgun/proc/toggle_real_state()
cycling = FALSE
@@ -147,4 +147,3 @@
max_ammo = 5
ammo_type = /obj/item/ammo_casing/smartgun
multiple_sprites = TRUE