Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
This commit is contained in:
kevinz000
2017-08-22 04:04:21 -07:00
committed by GitHub
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
+1 -1
View File
@@ -77,5 +77,5 @@
/obj/item/clothing/gloves/space_ninja/examine(mob/user)
..()
if(flags_1 & NODROP_1)
if(flags & NODROP)
to_chat(user, "The energy drain mechanism is: <B>[candrain?"active":"inactive"]</B>.")
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "s-ninja"
item_state = "secshoes"
permeability_coefficient = 0.01
flags_1 = NOSLIP_1
flags = NOSLIP
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 100, acid = 100)
strip_delay = 120
+8 -8
View File
@@ -130,15 +130,15 @@ Contents:
to_chat(H, "<span class='userdanger'>ERROR</span>: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
return FALSE
affecting = H
flags_1 |= NODROP_1 //colons make me go all |=
flags |= NODROP //colons make me go all |=
slowdown = FALSE
n_hood = H.head
n_hood.flags_1 |= NODROP_1
n_hood.flags |= NODROP
n_shoes = H.shoes
n_shoes.flags_1 |= NODROP_1
n_shoes.flags |= NODROP
n_shoes.slowdown--
n_gloves = H.gloves
n_gloves.flags_1 |= NODROP_1
n_gloves.flags |= NODROP
return TRUE
/obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/H)
@@ -150,18 +150,18 @@ Contents:
//This proc allows the suit to be taken off.
/obj/item/clothing/suit/space/space_ninja/proc/unlock_suit()
affecting = null
flags_1 &= ~NODROP_1
flags &= ~NODROP
slowdown = 1
icon_state = "s-ninja"
if(n_hood)//Should be attached, might not be attached.
n_hood.flags_1 &= ~NODROP_1
n_hood.flags &= ~NODROP
if(n_shoes)
n_shoes.flags_1 &= ~NODROP_1
n_shoes.flags &= ~NODROP
n_shoes.slowdown++
if(n_gloves)
n_gloves.icon_state = "s-ninja"
n_gloves.item_state = "s-ninja"
n_gloves.flags_1 &= ~NODROP_1
n_gloves.flags &= ~NODROP
n_gloves.candrain=0
n_gloves.draining=0