Merge pull request #11936 from farie82/antidrop-remove-on-drop

Dropped anti drop items now lose the antidrop status if not initialized with it

code/datums/spells/horsemask.dm

@@ -36,7 +36,7 @@
 		return
 
 	var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
-	magichead.flags |= NODROP		//curses!
+	magichead.flags |= NODROP | DROPDEL	//curses!
 	magichead.flags_inv = null	//so you can still see their face
 	magichead.voicechange = 1	//NEEEEIIGHH
 	target.visible_message(	"<span class='danger'>[target]'s face  lights up in fire, and after the event a horse's head takes its place!</span>", \

code/game/gamemodes/wizard/spellbook.dm

@@ -863,7 +863,7 @@
 	if(istype(user, /mob/living/carbon/human))
 		to_chat(user, "<font size='15' color='red'><b>HOR-SIE HAS RISEN</b></font>")
 		var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
-		magichead.flags |= NODROP		//curses!
+		magichead.flags |= NODROP | DROPDEL	//curses!
 		magichead.flags_inv = null	//so you can still see their face
 		magichead.voicechange = 1	//NEEEEIIGHH
 		if(!user.unEquip(user.wear_mask))

code/game/objects/effects/mines.dm

@@ -141,7 +141,7 @@
 		new /obj/effect/hallucination/delusion(victim.loc, victim, force_kind = "demon", duration = duration, skip_nearby = 0)
 
 	var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
-	chainsaw.flags |= NODROP
+	chainsaw.flags |= NODROP | DROPDEL
 	victim.drop_l_hand()
 	victim.drop_r_hand()
 	victim.put_in_hands(chainsaw)

code/game/objects/items.dm

@@ -347,6 +347,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 		A.Remove(user)
 	if(flags & DROPDEL)
 		qdel(src)
+	if((flags & NODROP) && !(initial(flags) & NODROP)) //Remove NODROP is dropped
+		flags &= ~NODROP
 	in_inventory = FALSE
 	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
 

code/modules/admin/topic.dm

@@ -1930,7 +1930,7 @@
 				evilcookie.reagents.add_reagent("mutagen", 10)
 				evilcookie.desc = "It has a faint green glow."
 				evilcookie.bitesize = 100
-				evilcookie.flags = NODROP
+				evilcookie.flags = NODROP | DROPDEL
 				H.drop_l_hand()
 				H.equip_to_slot_or_del(evilcookie, slot_l_hand)
 				logmsg = "a mutagen cookie."
@@ -1939,7 +1939,7 @@
 				evilcookie.reagents.add_reagent("hell_water", 25)
 				evilcookie.desc = "Sulphur-flavored."
 				evilcookie.bitesize = 100
-				evilcookie.flags = NODROP
+				evilcookie.flags = NODROP | DROPDEL
 				H.drop_l_hand()
 				H.equip_to_slot_or_del(evilcookie, slot_l_hand)
 				logmsg = "a hellwater cookie."

code/modules/ninja/suit/gloves.dm

@@ -11,4 +11,4 @@
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
-	transfer_prints = FALSE
+	transfer_prints = FALSE

code/modules/ninja/suit/head.dm

@@ -7,4 +7,4 @@
 	item_state = "s-ninja_hood"
 	armor = list(melee = 60, bullet = 60, laser = 45, energy = 15, bomb = 30, bio = 30, rad = 25)
 	unacidable = 1
-	blockTracking = 1
+	blockTracking = 1

code/modules/ninja/suit/mask.dm

@@ -28,4 +28,4 @@ Contents:
 
 /obj/item/clothing/mask/gas/space_ninja/Destroy()
 	QDEL_NULL(voice_changer)
-	return ..()
+	return ..()

code/modules/ninja/suit/shoes.dm

@@ -9,4 +9,4 @@
 	cold_protection = FEET
 	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
 	heat_protection = FEET
-	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT

code/modules/ninja/suit/suit.dm

@@ -86,4 +86,4 @@ Contents:
 		suitShoes = null
 		suitOccupant = null
 
-		return 1
+		return 1

code/modules/surgery/organs/augments_arms.dm

@@ -85,7 +85,7 @@
 
 	holder = item
 
-	holder.flags |= NODROP
+	holder.flags |= NODROP | DROPDEL
 	holder.unacidable = 1
 	holder.slot_flags = null
 	holder.w_class = WEIGHT_CLASS_HUGE