cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes duffelbag curse and curse of hunger code in general. (#7010)

Browse Source 
* Fixes duffelbag curse and curse of hunger code in general (#60290)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Fixes duffelbag curse and curse of hunger code in general.

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
This commit is contained in:
SkyratBot
2021-07-19 15:58:57 +01:00
committed by GitHub
co-authored by Watermelon914 Watermelon914
parent b308c67870
commit f964a28ed7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/curse_of_hunger.dm
+5 -3
View File
@@ -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)
code/modules/spells/spell_types/godhand.dm
+2
View File
@@ -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