cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
DZD
2015-08-21 18:38:42 -04:00
parent f3970fb304 64af990d63
commit 0965789925
328 changed files with 5474 additions and 4122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/hos.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/energy/hos
name = "HoS Energy Gun"
desc = "This is a modern recreation of the captain's antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
name = "head of security's energy gun"
desc = "This is a modern recreation of the captain's antique laser gun. This gun has several unique fire modes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
item_state = null //so the human update icon uses the icon_state instead.
icon_override = 'icons/mob/in-hand/guns.dmi'
code/modules/projectiles/guns/energy/special.dm
+2 -2
View File
@@ -308,7 +308,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
flags = CONDUCT | OPENCONTAINER
attack_verb = list("attacked", "slashed", "cut", "sliced")
charge_cost = 250
fire_delay = 10
fire_delay = 15
icon_override = 'icons/mob/in-hand/guns.dmi'
can_charge = 0
@@ -336,7 +336,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
modifystate = "adv_plasmacutter"
origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
projectile_type = /obj/item/projectile/plasma/adv
fire_delay = 8
fire_delay = 10
charge_cost = 100
/obj/item/weapon/gun/energy/disabler