Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

2019-07-15 17:23:01 +02:00
parent 8df59b0b5c 8c1b7c4f22
commit 4df4cbd721
478 changed files with 4954 additions and 2477 deletions
@@ -50,7 +50,8 @@
 				var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
 				H.dropItemToGround(H.get_item_by_slot(i), TRUE)
 				H.equip_to_slot_or_del(I, i)
-				I.item_flags |= NODROP | DROPDEL
+				ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT)
+				I.item_flags |= DROPDEL
 				I.name = "cursed " + I.name

 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)