cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 15:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

VOREStation Specific Merge Changes

Browse Source 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
This commit is contained in:
Leshana
2018-02-17 16:56:31 -05:00
parent 5edfc7516b
commit ef3df27528
12 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -22,7 +22,7 @@
force = 5
slot_flags = SLOT_BELT|SLOT_HOLSTER
charge_cost = 480
projectile_type = /obj/item/projectile/ion/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
/obj/item/weapon/gun/energy/phasegun
name = "phase pistol"