Kills off three more flags from flags_2 (#37529)

code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
This commit is contained in:
vuonojenmustaturska
2018-04-30 01:32:23 +03:00
committed by oranges
parent d9f9368c1d
commit ccf8fc5bc5
23 changed files with 36 additions and 38 deletions
+1 -1
View File
@@ -103,7 +103,7 @@
inhand_x_dimension = 64
inhand_y_dimension = 64
actions_types = list()
flags_2 = SLOWS_WHILE_IN_HAND_2
item_flags = SLOWS_WHILE_IN_HAND
var/datum/action/innate/dash/cult/jaunt
var/datum/action/innate/cult/spin2win/linked_action
var/spinning = FALSE
@@ -24,7 +24,7 @@
armour_penetration = 1000
resistance_flags = INDESTRUCTIBLE
anchored = TRUE
flags_2 = SLOWS_WHILE_IN_HAND_2
item_flags = SLOWS_WHILE_IN_HAND
var/team = WHITE_TEAM
var/reset_cooldown = 0
var/anyonecanpickup = TRUE
@@ -1115,7 +1115,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.back)
. += H.back.slowdown
for(var/obj/item/I in H.held_items)
if(I.flags_2 & SLOWS_WHILE_IN_HAND_2)
if(I.item_flags & SLOWS_WHILE_IN_HAND)
. += I.slowdown
var/health_deficiency = (100 - H.health + H.staminaloss)
if(health_deficiency >= 40)
@@ -13,7 +13,7 @@
w_class = WEIGHT_CLASS_NORMAL
// No running around with open laptops in hands.
flags_2 = SLOWS_WHILE_IN_HAND_2
item_flags = SLOWS_WHILE_IN_HAND
screen_on = 0 // Starts closed
var/start_open = TRUE // unless this var is set to 1
@@ -111,7 +111,7 @@
fire_sound = 'sound/weapons/laser.ogg'
mag_type = /obj/item/ammo_box/magazine/internal/minigun
casing_ejector = FALSE
flags_2 = SLOWS_WHILE_IN_HAND_2
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
var/obj/item/minigunpack/ammo_pack
/obj/item/gun/ballistic/minigun/Initialize()
@@ -146,5 +146,3 @@
/obj/item/gun/ballistic/minigun/dropped(mob/living/user)
ammo_pack.attach_gun(user)
+1 -1
View File
@@ -2,7 +2,7 @@
slot_flags = ITEM_SLOT_BACK
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
flags_2 = NO_MAT_REDEMPTION_2
item_flags = NEEDS_PERMIT | NO_MAT_REDEMPTION
/obj/item/gun/magic/staff/change
name = "staff of change"
@@ -392,7 +392,7 @@ Burning extracts:
throw_speed = 2
force = 15 //Heavy, but hard to wield.
attack_verb = list("bashed","pounded","slammed")
flags_2 = SLOWS_WHILE_IN_HAND_2
item_flags = SLOWS_WHILE_IN_HAND
/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform
@@ -417,4 +417,4 @@ Burning extracts:
/mob/living/simple_animal/slime/transformedslime/Reproduce() //Just in case.
to_chat(src, "<span class='warning'>I can't reproduce...</span>")
return
return