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

powder that makes you say yes

Browse Source
This commit is contained in:
CHOMPStation2
2021-12-10 00:17:29 -07:00
committed by GitHub
parent 9c7d030128
commit 1e358f9752
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,8 @@
battery_lock = 1 battery_lock = 1
var/decl/plantgene/gene = null var/decl/plantgene/gene = null
<<<<<<< HEAD
recoil_mode = 0 //CHOMP Addition recoil_mode = 0 //CHOMP Addition
=======
var/obj/item/weapon/stock_parts/micro_laser/emitter var/obj/item/weapon/stock_parts/micro_laser/emitter
>>>>>>> dead3acae1... Merge pull request #11841 from FartMaster69420/somatoray
firemodes = list( firemodes = list(
list(mode_name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"), list(mode_name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"),