cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408

Browse Source
This commit is contained in:
Ghommie
2019-12-09 00:04:22 +01:00
parent 3b8aebbbc2 9a5c7a0631
commit 414d4b7a90
375 changed files with 11630 additions and 8094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
View File

@@ -185,7 +185,6 @@
name = "particle blast"
damage = 13
icon_state = "disablerpellet"
icon = 'modular_citadel/icons/obj/projectiles.dmi'
/obj/item/projectile/beam/disabler/slug
name = "positron blast"
@@ -193,12 +192,10 @@
range = 14
speed = 0.6
icon_state = "disablerslug"
icon = 'modular_citadel/icons/obj/projectiles.dmi'
/obj/item/projectile/energy/electrode/pump
name = "electron blast"
icon_state = "stunjectile"
icon = 'modular_citadel/icons/obj/projectiles.dmi'
color = null
nodamage = 1
knockdown = 100