cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stunprod making now checks for NODROP.

Browse Source
This commit is contained in:
bgobandit
2015-10-14 21:10:42 -04:00
parent 1d4cc5fea7
commit 8a63e50b51
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+3 -3
View File
@@ -121,7 +121,7 @@
qdel(I)
qdel(src)
else if(istype(I, /obj/item/weapon/wirecutters))
else if(istype(I, /obj/item/weapon/wirecutters) && !(I.flags & NODROP))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
if(!remove_item_from_storage(user))
@@ -221,7 +221,7 @@
/obj/item/weapon/cane
name = "cane"
desc = "A cane used by a true gentlemen. Or a clown."
desc = "A cane used by a true gentleman. Or a clown."
icon = 'icons/obj/weapons.dmi'
icon_state = "cane"
item_state = "stick"
@@ -232,7 +232,7 @@
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
/obj/item/weapon/staff
name = "wizards staff"
name = "wizard staff"
desc = "Apparently a staff used by the wizard."
icon = 'icons/obj/wizard.dmi'
icon_state = "staff"