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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-03-27 00:20:39 -07:00
committed by GitHub
parent 390bca0ec1
commit bccde2328a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,12 +50,8 @@
icon_state = "energystun" icon_state = "energystun"
item_state = null //so the human update icon uses the icon_state instead. item_state = null //so the human update icon uses the icon_state instead.
force = 8 force = 8
<<<<<<< HEAD
w_class = ITEMSIZE_HUGE //Probably gonna make it a rifle sooner or later //CHOMP Edit, and so I did. w_class = ITEMSIZE_HUGE //Probably gonna make it a rifle sooner or later //CHOMP Edit, and so I did.
slot_flags = SLOT_BELT|SLOT_BACK //CHOMP Edit. Let's make it so that if it doesn't fit in a backpack, it doesn't fit in a holster either. slot_flags = SLOT_BELT|SLOT_BACK //CHOMP Edit. Let's make it so that if it doesn't fit in a backpack, it doesn't fit in a holster either.
=======
w_class = ITEMSIZE_LARGE
>>>>>>> cce944d043... Merge pull request #12522 from GhostActual/Firearms1
fire_delay = 6 fire_delay = 6
projectile_type = /obj/item/projectile/beam/stun/weak projectile_type = /obj/item/projectile/beam/stun/weak