mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-13 08:03:43 +01:00
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:
@@ -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."
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -28,4 +28,4 @@ Contents:
|
||||
|
||||
/obj/item/clothing/mask/gas/space_ninja/Destroy()
|
||||
QDEL_NULL(voice_changer)
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -86,4 +86,4 @@ Contents:
|
||||
suitShoes = null
|
||||
suitOccupant = null
|
||||
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user