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

[MIRROR] Kitchen Sink PR (#10745)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-26 10:16:57 -07:00
committed by GitHub
parent 42483a1d4a
commit 667e08ee0a
324 changed files with 504 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
View File

@@ -32,10 +32,10 @@
return
recharging = 1
update_icon()
playsound(src,'modular_chomp/sound/weapons/clockwork/clockwork_cock.ogg',25,1)
playsound(src,'sound/weapons/clockwork/clockwork_cock.ogg',25,1)
user.visible_message(span_notice("[user] pulls the charging handle on \the [src] and it whirrs to life!"), \
span_notice("You pull the charging handle on \the [src] and begin the reloading sequence."))
playsound(src,'modular_chomp/sound/weapons/clockwork/cwc_rifle_fabricate.ogg',25,5)
playsound(src,'sound/weapons/clockwork/cwc_rifle_fabricate.ogg',25,5)
while(recharging)
if(!do_after(user, 50, src))
break
@@ -48,13 +48,13 @@
user.hud_used.update_ammo_hud(user, src) // Update one last time once we're finished!
/obj/item/projectile/bullet/rifle/clockwork
fire_sound = 'modular_chomp/sound/weapons/clockwork/cwc_rifle_fire.ogg'
fire_sound = 'sound/weapons/clockwork/cwc_rifle_fire.ogg'
damage = 20 //Old 10
hud_state = "rifle_heavy"
/obj/item/projectile/beam/shock/clockwork
name = "shock beam"
fire_sound = 'modular_chomp/sound/weapons/clockwork/voltbeam_fire.ogg'
fire_sound = 'sound/weapons/clockwork/voltbeam_fire.ogg'
icon_state = "lightning"
damage_type = ELECTROCUTE
@@ -66,7 +66,7 @@
agony = 15
eyeblur = 2
hitsound = 'sound/effects/lightningshock.ogg'
hitsound_wall = 'modular_chomp/sound/weapons/clockwork/voltbeamsearwall.ogg'
hitsound_wall = 'sound/weapons/clockwork/voltbeamsearwall.ogg'
hud_state = "taser"
/obj/effect/projectile/muzzle/voltbeam

2
modular_chomp/code/modules/projectiles/guns/projectile/revolver.dm
View File

@@ -7,7 +7,7 @@
icon_state = "ukr"
item_state = "ukr"
icon = 'modular_chomp/icons/obj/guns/altmarksman/altmarksman.dmi'
fire_sound = 'modular_chomp/sound/weapons/marksmanalt.ogg'
fire_sound = 'sound/weapons/marksmanalt.ogg'
item_icons = list(
slot_l_hand_str = 'modular_chomp/icons/obj/guns/altmarksman/lefthand_guns.dmi',
slot_r_hand_str = 'modular_chomp/icons/obj/guns/altmarksman/righthand_guns.dmi',