Replace all secondary flags with bitflags stored in the flags_2 var
This commit is contained in:
@@ -46,7 +46,7 @@
|
||||
item_color = "red"
|
||||
dog_fashion = null
|
||||
name = "firefighter helmet"
|
||||
flags = STOPSPRESSUREDMAGE
|
||||
flags_1 = STOPSPRESSUREDMAGE_1
|
||||
heat_protection = HEAD
|
||||
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
|
||||
cold_protection = HEAD
|
||||
@@ -56,7 +56,7 @@
|
||||
icon_state = "hardhat0_white"
|
||||
item_state = "hardhat0_white"
|
||||
item_color = "white"
|
||||
flags = STOPSPRESSUREDMAGE
|
||||
flags_1 = STOPSPRESSUREDMAGE_1
|
||||
heat_protection = HEAD
|
||||
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
|
||||
cold_protection = HEAD
|
||||
@@ -76,7 +76,7 @@
|
||||
dog_fashion = null
|
||||
name = "atmospheric technician's firefighting helmet"
|
||||
desc = "A firefighter's helmet, able to keep the user cool in any situation."
|
||||
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
|
||||
flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
|
||||
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
|
||||
heat_protection = HEAD
|
||||
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
resistance_flags = 0
|
||||
flags_cover = HEADCOVERSEYES
|
||||
flags_inv = HIDEHAIR
|
||||
flags_2 = BANG_PROTECT_2
|
||||
|
||||
dog_fashion = /datum/dog_fashion/head/helmet
|
||||
|
||||
|
||||
/obj/item/clothing/head/helmet/Initialize()
|
||||
..()
|
||||
SET_SECONDARY_FLAG(src, BANG_PROTECT)
|
||||
|
||||
/obj/item/clothing/head/helmet/sec
|
||||
can_flashlight = 1
|
||||
@@ -65,7 +65,7 @@
|
||||
if(world.time > cooldown + toggle_cooldown)
|
||||
cooldown = world.time
|
||||
up = !up
|
||||
flags ^= visor_flags
|
||||
flags_1 ^= visor_flags
|
||||
flags_inv ^= visor_flags_inv
|
||||
flags_cover ^= visor_flags_cover
|
||||
icon_state = "[initial(icon_state)][up ? "up" : ""]"
|
||||
@@ -110,7 +110,7 @@
|
||||
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
|
||||
heat_protection = HEAD
|
||||
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
|
||||
flags = STOPSPRESSUREDMAGE
|
||||
flags_1 = STOPSPRESSUREDMAGE_1
|
||||
strip_delay = 80
|
||||
dog_fashion = null
|
||||
|
||||
@@ -191,11 +191,11 @@
|
||||
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
|
||||
strip_delay = 80
|
||||
dog_fashion = null
|
||||
// old knight helmets do not offer protection against loud noises
|
||||
flags_2 = NONE
|
||||
|
||||
/obj/item/clothing/head/helmet/knight/Initialize(mapload)
|
||||
..()
|
||||
// old knight helmets do not offer protection against loud noises
|
||||
CLEAR_SECONDARY_FLAG(src, BANG_PROTECT)
|
||||
|
||||
/obj/item/clothing/head/helmet/knight/blue
|
||||
icon_state = "knight_blue"
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
/obj/item/clothing/head/beret/highlander
|
||||
desc = "That was white fabric. <i>Was.</i>"
|
||||
flags = NODROP
|
||||
flags_1 = NODROP_1
|
||||
dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
|
||||
|
||||
//Security
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
icon_state = "shamebrero"
|
||||
item_state = "shamebrero"
|
||||
desc = "Once it's on, it never comes off."
|
||||
flags = NODROP
|
||||
flags_1 = NODROP_1
|
||||
dog_fashion = null
|
||||
|
||||
/obj/item/clothing/head/cone
|
||||
|
||||
Reference in New Issue
Block a user