Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)

* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
This commit is contained in:
vuonojenmustaturska
2018-06-01 11:36:31 +02:00
committed by AnturK
parent 2686a3b40f
commit c65a99f130
156 changed files with 326 additions and 292 deletions
@@ -7,6 +7,6 @@
singular_name = "hide plate"
max_amount = 6
novariants = FALSE
flags_1 = NOBLUDGEON_1
item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
layer = MOB_LAYER
@@ -63,7 +63,8 @@
/obj/item/pickaxe/drill/cyborg
name = "cyborg mining drill"
desc = "An integrated electric mining drill."
flags_1 = NODROP_1
item_flags = NODROP
flags_1 = NONE
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
@@ -21,7 +21,7 @@
name = "regenerative core"
desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
icon_state = "roro core 2"
flags_1 = NOBLUDGEON_1
item_flags = NOBLUDGEON
slot = "hivecore"
force = 0
actions_types = list(/datum/action/item_action/organ_action/use)
@@ -189,7 +189,7 @@
activated()
/obj/item/rod_of_asclepius/proc/activated()
flags_1 = NODROP_1 | DROPDEL_1
item_flags = NODROP | DROPDEL
desc = "A short wooden rod with a mystical snake inseparably gripping itself and the rod to your forearm. It flows with a healing energy that disperses amongst yourself and those around you. "
icon_state = "asclepius_active"
activated = TRUE
@@ -382,7 +382,7 @@
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
fire_sound = 'sound/weapons/batonextend.ogg'
max_charges = 1
flags_1 = NOBLUDGEON_1
item_flags = NEEDS_PERMIT | NOBLUDGEON
force = 18
/obj/item/ammo_casing/magic/hook