Merge pull request #8886 from Ghommie/Ghommie-cit137

Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
parent 5be6b358f0 a3a2fb03b6
commit 2ec5d3f02e
82 changed files with 388 additions and 211 deletions
@@ -15,7 +15,6 @@
 	icon_state = "golhood"
 	desc = "A hood for a cloak."
 	body_parts_covered = HEAD
-	item_flags = NODROP
 	flags_inv = HIDEHAIR|HIDEEARS

 /obj/item/clothing/neck/cloak/suicide_act(mob/user)
@@ -237,7 +237,10 @@
 	desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
 	icon_state = "ponchoshame"
 	item_state = "ponchoshame"
-	item_flags = NODROP
+
+/obj/item/clothing/suit/poncho/ponchoshame/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)

 /obj/item/clothing/suit/whitedress
 	name = "white dress"