Skip to content

Commit

Permalink
Merge pull request #5592 from ARF-SS13/tend-3.0
Browse files Browse the repository at this point in the history
Tend to Heal Overhaul
  • Loading branch information
Tk420634 authored Jan 16, 2025
2 parents 3c899c6 + dcddd99 commit dd3aca5
Show file tree
Hide file tree
Showing 5 changed files with 269 additions and 125 deletions.
2 changes: 1 addition & 1 deletion AAADevTool/AAA_DEVELOPMENT_CONFIG.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"sanic speed" : false
"sanic speed" : true
}
41 changes: 40 additions & 1 deletion code/game/objects/hand_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,46 @@
action_verb_s = "tends"
action_verb_ing = "tending"
can_taste = FALSE


/obj/item/hand_item/tactile/tender/Initialize(mapload, new_amount, merge)
. = ..()
START_PROCESSING(SSfastprocess, src)

/obj/item/hand_item/tactile/tender/Destroy()
STOP_PROCESSING(SSfastprocess, src)
. = ..()

/obj/item/hand_item/tactile/tender/process()
var/mob/living/holder = loc
if(!istype(holder))
return
var/nut = "[round((max(holder.nutrition - NUTRITION_LEVEL_STARVING, 0)), 5)]"
var/res = "[round(holder.heal_reservoir)]"
switch(holder.nutrition)
if(-INFINITY to NUTRITION_LEVEL_STARVING)
nut = span_alert(nut)
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_FED)
if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
nut = span_notice(nut)
if(NUTRITION_LEVEL_WELL_FED to (NUTRITION_LEVEL_FAT * 2))
nut = span_green(nut)
if((NUTRITION_LEVEL_FAT * 2) to INFINITY)
nut = span_green(nut)
nut = "<b>[nut]</b>"
nut = "🍖[nut]"
switch(holder.heal_reservoir)
if(-INFINITY to 2)
res = span_alert(res)
if(2 to 5)
if(5 to 15)
res = span_green(res)
if(15 to INFINITY)
res = span_green(res)
res = "<b>[res]</b>"
res = "💧[res]"
maptext = "[nut]\n[res]"
maptext_width = 64

/obj/item/hand_item/tactile/toucher/horny //being repurposed as a way to 'feel' the world around the player. Specifically other players though, lets be real.
grope = /datum/grope_kiss_MERP

Expand Down
Loading

0 comments on commit dd3aca5

Please sign in to comment.