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

Removes conductive flags from VR stuff

Browse Source
This commit is contained in:
Unknown
2019-03-28 21:26:43 -04:00
committed by Novacat
parent 30b967e28a
commit 3aa0fdfda5
9 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/guns/energy/special.dm
View File

@@ -126,11 +126,6 @@
icon = 'icons/obj/gun.dmi'
item_icons = null
icon_state = "staffofchange"
<<<<<<< HEAD
fire_sound = 'sound/weapons/emitter.ogg'
flags = CONDUCT
=======
>>>>>>> f093ebd... Merge pull request #5987 from Anewbe/shock_grilles
slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE
charge_cost = 480