cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

2
code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
View File

@@ -21,7 +21,7 @@
item_state = "multicannon"
slot_flags = SLOT_BACK
recoil = FALSE
fire_sound = 'modular_chomp/sound/weapons/energy/laser_strong.ogg' // CHOMPedit: New firesound, overwrites the sfx from the macrobatteries.
fire_sound = 'sound/weapons/energy/laser_strong.ogg' // CHOMPedit: New firesound, overwrites the sfx from the macrobatteries.
/obj/item/gun/projectile/multi_cannon/update_icon()
. = ..()

2
code/modules/projectiles/guns/energy/laser_yw.dm
View File

@@ -6,7 +6,7 @@
item_state = "gauss"
desc = "An older model of the experimental Gauss weapon series produced by Hephaestus industries. As it is unable to pass through glass, it was phased out during the mars-sol conflict due to the invention of laser carbines.Nevertheless, it still packs a punch and is easy to maintain, making it a favorite amongst sol privateers."
force = 5
fire_sound = 'modular_chomp/sound/weapons/laser4.ogg' //lighter damage sound //CHMOMPEdit - Sound moved to modular files to prevent conflict with an upstream laser sound file
fire_sound = 'sound/weapons/laser4.ogg' //lighter damage sound //CHMOMPEdit - Sound moved to modular files to prevent conflict with an upstream laser sound file
slot_flags = SLOT_BELT|SLOT_HOLSTER
w_class = 2
projectile_type = /obj/item/projectile/energy/gauss

2
code/modules/projectiles/projectile/bullets_ch.dm
View File

@@ -76,7 +76,7 @@ only use the hollow_point and armor_penetration values.*/
velocity = 360
/obj/item/projectile/bullet/a57
fire_sound = 'modular_chomp/sound/weapons/ballistics/smg_heavy.ogg'
fire_sound = 'sound/weapons/ballistics/smg_heavy.ogg'
diam = 5.7
grains = 31
velocity = 716

8
code/modules/projectiles/projectile/energy_ch.dm
View File

@@ -27,7 +27,7 @@
/obj/item/projectile/energy/phase
name = "phase wave"
icon_state = "phase"
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds.
fire_sound = 'sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds.
range = 13
damage = 5
SA_bonus_damage = 45
@@ -36,14 +36,14 @@
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/light
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds.
fire_sound = 'sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds.
range = 11
SA_bonus_damage = 35
armor_penetration = -50
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy
fire_sound = 'modular_chomp/sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds.
fire_sound = 'sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds.
range = 16 //Chompedit This range was not great
damage = 10
SA_bonus_damage = 50
@@ -51,7 +51,7 @@
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy/cannon
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds.
fire_sound = 'sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds.
range = 20 //Chompedit This range was mediocre, but not worth a cannon.
damage = 15
SA_bonus_damage = 60