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

Merge pull request #2874 from cadyn/upstream-merge-11421

Browse Source 
Merge Upstream Pull Request 11421
This commit is contained in:
Nadyr
2021-08-25 22:38:53 -04:00
committed by GitHub
parent 77083e9210 c908563dec
commit f19dc1b2eb
61 changed files with 700 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -139,6 +139,7 @@
force = 5
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
unacidable = TRUE
projectile_type = /obj/item/projectile/beam
origin_tech = null
fire_delay = 10 //Old pistol