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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-03-21 14:12:35 -04:00
committed by GitHub
parent dc618675c1
commit 4ffd7ae53f
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -300,15 +300,9 @@
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' \
branding for its military-grade equipment used by professional armed forces across human space."
icon_state = "ashot"
<<<<<<< HEAD
item_state = null
wielded_item_state = "woodarifle-wielded" //Placeholder
w_class = ITEMSIZE_HUGE //CHOMP Edit.
=======
item_state = "ashot"
wielded_item_state = "ashot-wielded"
w_class = ITEMSIZE_LARGE
>>>>>>> e6662604ec... Merge pull request #12499 from GhostActual/shotguns-galore
w_class = ITEMSIZE_HUGE //CHOMP Edit.
force = 10
caliber = "12g"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
@@ -473,4 +467,4 @@
if(ammo_magazine)
icon_state = "combatsmg"
else
icon_state = "combatsmg-empty"
icon_state = "combatsmg-empty"