cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 16:38:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Dip
2020-10-18 16:54:22 -03:00
parent 6163b7c963 7586bd96c6
commit 9b7eee0a89
32 changed files with 573 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy/stun.dm
+1 -1
View File
@@ -13,7 +13,7 @@
e_cost = 100
/obj/item/ammo_casing/energy/electrode/hos
e_cost = 200
e_cost = 100
/obj/item/ammo_casing/energy/electrode/old
e_cost = 1000
code/modules/projectiles/guns/energy/energy_gun.dm
+1
View File
@@ -54,6 +54,7 @@
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
cell_type = /obj/item/stock_parts/cell{charge = 1600; maxcharge = 1600; chargerate = 160}
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 4