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:58:40 -04:00
committed by Raeschen
parent 090b24cb3d
commit 2754b0cf08
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,15 +2,10 @@
* Pulse Rifle * Pulse Rifle
*/ */
/obj/item/weapon/gun/energy/pulse_rifle /obj/item/weapon/gun/energy/pulse_rifle
<<<<<<< HEAD
name = "pulse rifle"
desc = "A weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. Because of its complexity and cost, it is rarely seen in use except by specialists."
icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
=======
name = "\improper LP1 Locust Rifle" name = "\improper LP1 Locust Rifle"
desc = "The Bishamonten LP1 is a weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. \ desc = "The Bishamonten LP1 is a weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. \
Because of its complexity and cost, it is rarely seen in use except by specialists." Because of its complexity and cost, it is rarely seen in use except by specialists."
>>>>>>> a91e034c03... Merge pull request #12686 from GhostActual/gun-revmap-2022 icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
icon_state = "pulse" icon_state = "pulse"
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.
slot_flags = SLOT_BELT|SLOT_BACK slot_flags = SLOT_BELT|SLOT_BACK