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

Update projectile_ch.dm (#11951)

Browse Source
This commit is contained in:
Cameron Lennox
2025-11-09 03:05:35 -05:00
committed by GitHub
parent 54b9b3f6bc
commit 66871246c5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
archive/maps/old_yw/yw/cryogaia_things.dm
View File

@@ -386,7 +386,7 @@ var/global/list/latejoin_tram = list()
if(welder.remove_fuel(0,user) && welder && welder.isOn()) if(welder.remove_fuel(0,user) && welder && welder.isOn())
to_chat(user, span_notice("You start to melt the ice off \the [src]")) to_chat(user, span_notice("You start to melt the ice off \the [src]"))
playsound(src, welder.usesound, 50, 1) playsound(src, welder.usesound, 50, 1)
if(do_after(user, welderTime SECONDS)) if(do_after(user, welderTime SECONDS, src))
to_chat(user, span_notice("You finish melting the ice off \the [src]")) to_chat(user, span_notice("You finish melting the ice off \the [src]"))
unFreeze() unFreeze()
return return
@@ -410,7 +410,7 @@ var/global/list/latejoin_tram = list()
/obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/W as obj, mob/user as mob, var/time = 15 as num) /obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/W as obj, mob/user as mob, var/time = 15 as num)
to_chat(user, span_notice("You start to chip at the ice covering \the [src]")) to_chat(user, span_notice("You start to chip at the ice covering \the [src]"))
if(do_after(user, text2num(time SECONDS))) if(do_after(user, text2num(time SECONDS), src))
unFreeze() unFreeze()
to_chat(user, span_notice("You finish chipping the ice off \the [src]")) to_chat(user, span_notice("You finish chipping the ice off \the [src]"))

6
code/modules/projectiles/guns/projectile_ch.dm
View File

@@ -68,7 +68,7 @@
/obj/item/gun/projectile/attack_self(mob/user as mob) /obj/item/gun/projectile/attack_self(mob/user as mob)
if(manual_chamber) if(manual_chamber)
if(do_after(user,4)) if(do_after(user, 0.4 SECONDS, src))
bolt_handle(user) bolt_handle(user)
else if(firemodes.len > 1) else if(firemodes.len > 1)
switch_firemodes(user) switch_firemodes(user)
@@ -322,14 +322,14 @@
if(!CHECK_BITFIELD(auto_loading_type,OPEN_BOLT)) if(!CHECK_BITFIELD(auto_loading_type,OPEN_BOLT))
if(!chambered) if(!chambered)
if(bolt_open) if(bolt_open)
if(do_after(user,5)) if(do_after(user, 0.5 SECONDS, src))
user.visible_message(span_notice("[user] slides \the [C] into the [src]'s chamber."),span_notice("You slide \the [C] into the [src]'s chamber.")) user.visible_message(span_notice("[user] slides \the [C] into the [src]'s chamber."),span_notice("You slide \the [C] into the [src]'s chamber."))
chambered = C chambered = C
user.hud_used.update_ammo_hud(user, src) user.hud_used.update_ammo_hud(user, src)
else else
return return
else if(!(CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK)))) else if(!(CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK))))
if(do_after(user,15)) if(do_after(user, 1.5 SECONDS, src))
user.visible_message(span_notice("[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again."),span_notice("You slide \the [C] into the [src]'s chamber.")) user.visible_message(span_notice("[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again."),span_notice("You slide \the [C] into the [src]'s chamber."))
chambered = C chambered = C