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
@@ -22,7 +22,11 @@
 	resistance_flags = NONE

 /obj/item/clothing/under/color/black/ghost
-	item_flags = NODROP | DROPDEL
+	item_flags = DROPDEL
+
+/obj/item/clothing/under/color/black/ghost/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)

 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
@@ -388,7 +388,10 @@

 /obj/item/clothing/under/kilt/highlander
 	desc = "You're the only one worthy of this kilt."
-	item_flags = NODROP
+
+/obj/item/clothing/under/kilt/highlander/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)

 /obj/item/clothing/under/sexymime
 	name = "sexy mime outfit"