Merge pull request #2927 from Citadel-Station-13/upstream-merge-30958

[MIRROR] Makes a flags var use NONE instead of 0
This commit is contained in:
LetterJay
2017-09-27 16:31:38 -04:00
committed by GitHub
+3 -4
View File
@@ -1,11 +1,10 @@
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = SLOT_EARS
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
@@ -15,7 +14,7 @@
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
@@ -43,4 +42,4 @@
H.update_inv_ears()
H.update_inv_neck()
H.update_inv_head()
to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")
to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")