mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 23:27:34 +01:00
Fixes duffelbag curse and curse of hunger code in general (#60290)
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
This commit is contained in:
co-authored by
Watermelon914
parent
e073e587c7
commit
bad807638c
@@ -123,11 +123,13 @@
|
||||
if(!poison_food_tolerance)
|
||||
cursed.dropItemToGround(cursed_item, TRUE)
|
||||
return
|
||||
hunger++
|
||||
if((hunger <= HUNGER_THRESHOLD_TRY_EATING) && prob(20))
|
||||
hunger += delta_time
|
||||
if((hunger <= HUNGER_THRESHOLD_TRY_EATING) || prob(80))
|
||||
return
|
||||
|
||||
var/list/locations_to_check = (cursed.contents + cursed_item.contents)
|
||||
//check hungry enough to eat something!
|
||||
for(var/obj/item/food in cursed.contents)
|
||||
for(var/obj/item/food in locations_to_check)
|
||||
if(!IS_EDIBLE(food))
|
||||
continue
|
||||
food.forceMove(cursed.loc)
|
||||
|
||||
@@ -152,6 +152,8 @@
|
||||
span_danger("You feel something attaching itself to you, and a strong desire to discuss your [elaborate_backstory] at length!"))
|
||||
|
||||
ADD_TRAIT(duffelvictim, TRAIT_DUFFEL_CURSE_PROOF, CURSED_ITEM_TRAIT(conjuredduffel.name))
|
||||
conjuredduffel.pickup(duffelvictim)
|
||||
conjuredduffel.forceMove(duffelvictim)
|
||||
if(duffelvictim.dropItemToGround(duffelvictim.back))
|
||||
duffelvictim.equip_to_slot_if_possible(conjuredduffel, ITEM_SLOT_BACK, TRUE, TRUE)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user