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

Dropped anti drop items now lose the antidrop status if not initialized with it
This commit is contained in:
variableundefined
2019-08-24 10:53:23 -04:00
committed by GitHub
11 changed files with 13 additions and 11 deletions
+2 -2
View File
@@ -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."
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -28,4 +28,4 @@ Contents:
/obj/item/clothing/mask/gas/space_ninja/Destroy()
QDEL_NULL(voice_changer)
return ..()
return ..()
+1 -1
View File
@@ -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
+1 -1
View File
@@ -86,4 +86,4 @@ Contents:
suitShoes = null
suitOccupant = null
return 1
return 1
+1 -1
View File
@@ -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