From 952a17f14b24d9fccc3a3fc9aa365bded5d25fb8 Mon Sep 17 00:00:00 2001
From: DynaJ0ule <117537167+DynaJ0ule@users.noreply.github.com>
Date: Wed, 22 Mar 2023 15:48:12 -0400
Subject: [PATCH] New fatness compatible. New simpler proc. Beckon.
---
code/game/objects/structures/statues.dm | 77 +++++++++----------------
1 file changed, 26 insertions(+), 51 deletions(-)
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 361f7b2d..cfd459bd 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -333,7 +333,7 @@
var/active = null
var/last_event = 0
-/obj/structure/statue/calorite/fatty/proc/beacon()
+/obj/structure/statue/calorite/fatty/proc/beckon()
if(!active)
if(world.time > last_event+15)
active = 1
@@ -344,70 +344,45 @@
return
return
+/obj/structure/statue/calorite/fatty/proc/statue_fatten(mob/living/carbon/M)
+ if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
+ to_chat(M, "Nothing happens.")
+ return
+
+ if(M.fatness < FATNESS_LEVEL_FAT)
+ to_chat(M, "The moment your hand meets the statue, you feel a little warmer...")
+ else if(M.fatness < FATNESS_LEVEL_VERYFAT)
+ to_chat(M, "Upon each poke of the statue, you feel yourself get a little heavier.")
+ else if(M.fatness < FATNESS_LEVEL_MORBIDLY_OBESE)
+ to_chat(M, "With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.")
+ else if(M.fatness < FATNESS_LEVEL_BARELYMOBILE)
+ to_chat(M, "The world around you blurs as you focus on prodding the statue, your waistline widening further...")
+ else if(M.fatness < FATNESS_LEVEL_IMMOBILE)
+ to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.")
+ else if(M.fatness < FATNESS_LEVEL_BLOB)
+ to_chat(M, "You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...")
+
/obj/structure/statue/calorite/fatty/Bumped(atom/movable/AM)
- beacon()
+ beckon()
..()
/obj/structure/statue/calorite/fatty/Crossed(var/mob/AM)
.=..()
if(!.)
if(istype(AM))
- beacon()
+ beckon()
/obj/structure/statue/calorite/fatty/Moved(atom/movable/AM)
- beacon()
+ beckon()
..()
/obj/structure/statue/calorite/fatty/attackby(obj/item/W, mob/living/carbon/M, params)
- if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
- to_chat(M, "Nothing happens.")
- return
-
- if(M.fatness < 200)
- to_chat(M, "The moment your hand meets the statue, you feel a little warmer...")
- if(HAS_TRAIT(M, TRAIT_FAT))
- to_chat(M, "Upon each poke of the statue, you feel yourself get a little heavier.")
- if(HAS_TRAIT(M, TRAIT_OBESE))
- to_chat(M, "With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.")
- if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
- to_chat(M, "The world around you blurs as you focus on prodding the statue, your waistline widening further...")
- if(HAS_TRAIT(M, TRAIT_IMMOBILE))
- to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.")
- if(HAS_TRAIT(M, TRAIT_BLOB))
- to_chat(M, "You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...")
+ statue_fatten(M)
/obj/structure/statue/calorite/fatty/attack_hand(mob/living/carbon/M)
- if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
- to_chat(M, "Nothing happens.")
- return
-
- if(M.fatness < 200)
- to_chat(M, "The moment your hand meets the statue, you feel a little warmer...")
- if(HAS_TRAIT(M, TRAIT_FAT))
- to_chat(M, "Upon each poke of the statue, you feel yourself get a little heavier.")
- if(HAS_TRAIT(M, TRAIT_OBESE))
- to_chat(M, "With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.")
- if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
- to_chat(M, "The world around you blurs as you focus on prodding the statue, your waistline widening further...")
- if(HAS_TRAIT(M, TRAIT_IMMOBILE))
- to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.")
- if(HAS_TRAIT(M, TRAIT_BLOB))
- to_chat(M, "You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...")
+ statue_fatten(M)
/obj/structure/statue/calorite/fatty/attack_paw(mob/living/carbon/M)
- if(!M.adjust_fatness(20, FATTENING_TYPE_ITEM))
- to_chat(M, "Nothing happens.")
- return
+ statue_fatten(M)
+
- if(M.fatness < 200)
- to_chat(M, "The moment your hand meets the statue, you feel a little warmer...")
- if(HAS_TRAIT(M, TRAIT_FAT))
- to_chat(M, "Upon each poke of the statue, you feel yourself get a little heavier.")
- if(HAS_TRAIT(M, TRAIT_OBESE))
- to_chat(M, "With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.")
- if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
- to_chat(M, "The world around you blurs as you focus on prodding the statue, your waistline widening further...")
- if(HAS_TRAIT(M, TRAIT_IMMOBILE))
- to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.")
- if(HAS_TRAIT(M, TRAIT_BLOB))
- to_chat(M, "You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...")