tweaks, feeding tube improvement

- cyborg's feeding tube now continously pumps someone with nutriment if the borg grabs their victim
- fixed missing GATO carpet item icon
This commit is contained in:
evilew
2024-06-04 12:57:42 +02:00
parent a8c9fd56a0
commit b5e6bb5ae0
4 changed files with 28 additions and 8 deletions
@@ -34,7 +34,7 @@
/obj/machinery/power/adipoelectric_generator/process()
if(!occupant)
src.visible_message("<span class='alert'>The [src] buzzes. It needs someon inside.</span>")
src.visible_message("<span class='alert'>The [src] buzzes. It needs someone inside.</span>")
playsound(src, 'sound/machines/buzz-two.ogg', 50)
return PROCESS_KILL
if(occupant:fatness_real > 0 && powernet && anchored && (emp_timer < world.time))
@@ -110,3 +110,12 @@
if(!no_mob_color)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
// /obj/item/reagent_containers/food/snacks/meat/steak/troll
// name = "Troll steak"
// desc = "In its sliced state it remains dormant, but once the troll meat comes in contact with stomach acids, it begins a perpetual cycle of constant regrowth and digestion. You probably shouldn't eat this."
// var/hunger_threshold = NUTRITION_LEVEL_FULL
// var/nutrition_amount = 20 // somewhere around 5 pounds
// var/fullness_to_add = 10
// var/message = "<span class='notice'>You feel fuller...</span>" // GS13
@@ -181,6 +181,8 @@
recharge_time = 3
accepts_reagent_upgrades = FALSE
reagent_ids = list(/datum/reagent/consumable/cream, /datum/reagent/consumable/milk, /datum/reagent/consumable/nutriment)
var/starttime = 0
var/chemtoadd = 5
/obj/item/reagent_containers/borghypo/feeding_tube/attack(mob/living/carbon/M, mob/user)
var/datum/reagents/R = reagent_list[mode]
@@ -190,13 +192,22 @@
if(!istype(M))
return
if(R.total_volume && M.can_inject(user, 1, user.zone_selected,bypass_protection))
to_chat(M, "<span class='warning'>You feel the cyborg's feeding tube pour liquid down your throat!</span>")
to_chat(user, "<span class='notice'>You feed [M] with the integrated feeding tube.</span>")
var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1)
R.reaction(M, INJECT, fraction)
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>[trans] unit\s injected. [R.total_volume] unit\s remaining.</span>")
if(M == user.pulling && ishuman(user.pulling))
starttime = world.time
while(starttime + 300 > world.time && in_range(user, M))
if(do_mob(user, M, 10, 0, 1))
M.reagents.add_reagent(/datum/reagent/consumable/nutriment, chemtoadd)
M.visible_message("<span class='danger'>[user] pumps some liquid in [M]!</span>","<span class='userdanger'>[user] pumps some liquid in you!</span>")
else
to_chat(M, "<span class='warning'>You feel the cyborg's feeding tube pour liquid down your throat!</span>")
to_chat(user, "<span class='warning'>You feed [M] with the integrated feeding tube.</span>")
visible_message("<span class='warning'>The cyborg's feeding tube pours liquid down [M]'s throat!</span>")
var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1)
R.reaction(M, INJECT, fraction)
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>[trans] unit\s injected. [R.total_volume] unit\s remaining.</span>")
/obj/item/reagent_containers/borghypo/feeding_tube/regenerate_reagents()
if(iscyborg(src.loc))
Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB