diff --git a/GainStation13/code/machinery/adipoelectric_generator.dm b/GainStation13/code/machinery/adipoelectric_generator.dm index 35093d20..f220b82f 100644 --- a/GainStation13/code/machinery/adipoelectric_generator.dm +++ b/GainStation13/code/machinery/adipoelectric_generator.dm @@ -34,7 +34,7 @@ /obj/machinery/power/adipoelectric_generator/process() if(!occupant) - src.visible_message("The [src] buzzes. It needs someon inside.") + src.visible_message("The [src] buzzes. It needs someone inside.") playsound(src, 'sound/machines/buzz-two.ogg', 50) return PROCESS_KILL if(occupant:fatness_real > 0 && powernet && anchored && (emp_timer < world.time)) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index bc38ef89..02d1f2c9 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -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 = "You feel fuller..." // GS13 diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index ba187af0..caf53aae 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -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, "You feel the cyborg's feeding tube pour liquid down your throat!") - to_chat(user, "You feed [M] with the integrated feeding tube.") - 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, "[trans] unit\s injected. [R.total_volume] unit\s remaining.") + + 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("[user] pumps some liquid in [M]!","[user] pumps some liquid in you!") + else + to_chat(M, "You feel the cyborg's feeding tube pour liquid down your throat!") + to_chat(user, "You feed [M] with the integrated feeding tube.") + visible_message("The cyborg's feeding tube pours liquid down [M]'s throat!") + 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, "[trans] unit\s injected. [R.total_volume] unit\s remaining.") /obj/item/reagent_containers/borghypo/feeding_tube/regenerate_reagents() if(iscyborg(src.loc)) diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 3203d8e3..6c4da790 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ