cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6186 from Fox-McCloud/stunprod

Browse Source 
Tweaks the Stunprod
This commit is contained in:
Crazy Lemon
2017-02-06 05:46:26 -08:00
committed by GitHub
parent 924dd8c04c 249cd3279c
commit cc2eceb0a3
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+11 -6
View File
@@ -29,11 +29,6 @@
bcell = null
return ..()
/obj/item/weapon/melee/baton/CheckParts(list/parts_list)
..()
bcell = locate(/obj/item/weapon/stock_parts/cell) in contents
update_icon()
/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
..()
bcell = new(src)
@@ -200,8 +195,18 @@
desc = "An improvised stun baton."
icon_state = "stunprod_nocell"
item_state = "prod"
w_class = 3
force = 3
throwforce = 5
stunforce = 5
hitcost = 3750
slot_flags = null
slot_flags = SLOT_BACK
var/obj/item/device/assembly/igniter/sparkler = 0
/obj/item/weapon/melee/baton/cattleprod/New()
..()
sparkler = new (src)
/obj/item/weapon/melee/baton/cattleprod/baton_stun()
if(sparkler.activate())
..()
code/game/objects/items/weapons/weaponry.dm
+4 -4
View File
@@ -105,10 +105,10 @@ obj/item/weapon/wirerod
force = 9
throwforce = 10
w_class = 3
materials = list(MAT_METAL=1000)
materials = list(MAT_METAL=1150, MAT_GLASS=75)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/weapon/shard))
var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear
@@ -122,7 +122,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
qdel(I)
qdel(src)
else if(istype(I, /obj/item/weapon/wirecutters))
else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
if(!remove_item_from_storage(user))
@@ -130,7 +130,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.unEquip(I)
user.put_in_hands(P)
to_chat(user, "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>")
to_chat(user, "<span class='notice'>You fasten [I] to the top of the rod with the cable.</span>")
qdel(I)
qdel(src)