Uppercases slot defines.

This commit is contained in:
oranges
2018-04-27 20:14:39 -05:00
committed by CitadelStationBot
parent ab3c55ab23
commit 7d45e045a3
207 changed files with 1507 additions and 692 deletions
+6 -1
View File
@@ -5,7 +5,7 @@
item_state = "baton"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
slot_flags = SLOT_BELT
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
@@ -195,8 +195,13 @@
stunforce = 100
hitcost = 2000
throw_hit_chance = 10
<<<<<<< HEAD
slot_flags = SLOT_BACK
var/obj/item/device/assembly/igniter/sparkler = 0
=======
slot_flags = ITEM_SLOT_BACK
var/obj/item/assembly/igniter/sparkler = 0
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
/obj/item/melee/baton/cattleprod/Initialize()
. = ..()