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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-04-17 18:56:12 -04:00
committed by Raeschen
parent 1a7983f8cf
commit 090b24cb3d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,16 +3,11 @@
*/ */
/obj/item/weapon/gun/energy/gun /obj/item/weapon/gun/energy/gun
name = "energy gun" name = "energy gun"
<<<<<<< HEAD
desc = "Another bestseller of Lawson Arms, the LAEP80 Thor is a versatile energy based pistol, capable of switching between low and high capacity projectile settings. In other words: Stun or Kill."
description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile weapons to security and law enforcement agencies."
icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
=======
desc = "Another bestseller of Lawson Arms, the LAEP80 Thor is a versatile energy based pistol, capable of switching between low and high \ desc = "Another bestseller of Lawson Arms, the LAEP80 Thor is a versatile energy based pistol, capable of switching between low and high \
capacity projectile settings. In other words: Stun or Kill." capacity projectile settings. In other words: Stun or Kill."
description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile \ description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile \
weapons to security and law enforcement agencies." weapons to security and law enforcement agencies."
>>>>>>> a91e034c03... Merge pull request #12686 from GhostActual/gun-revmap-2022 icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
icon_state = "egunstun" icon_state = "egunstun"
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.
fire_delay = 8 fire_delay = 8