mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 23:51:17 +01:00
Animal Tweaks: Second attempt (#849)
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5 # Conflicts: # code/modules/mob/living/living.dm * REMOVED VENT THINGS FROM CHANGELOG * switch statement for helper
This commit is contained in:
@@ -63,6 +63,7 @@
|
||||
icon_state = "soda_dispenser"
|
||||
ui_title = "Soda Dispenser"
|
||||
accept_drinking = 1
|
||||
density = 0//It's a half-height machine that sits on a table, this allows small things to walk under that table
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_soft/full
|
||||
spawn_cartridges = list(
|
||||
@@ -91,6 +92,7 @@
|
||||
icon_state = "booze_dispenser"
|
||||
ui_title = "Booze Dispenser"
|
||||
accept_drinking = 1
|
||||
density = 0//It's a half-height machine that sits on a table, this allows small things to walk under that table
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_alc/full
|
||||
spawn_cartridges = list(
|
||||
|
||||
@@ -110,6 +110,8 @@
|
||||
|
||||
else if (isanimal(M))
|
||||
var/mob/living/simple_animal/SA = M
|
||||
SA.scan_interval = SA.min_scan_interval//Feeding an animal will make it suddenly care about food
|
||||
|
||||
var/m_bitesize = bitesize * SA.bite_factor//Modified bitesize based on creature size
|
||||
var/amount_eaten = m_bitesize
|
||||
|
||||
@@ -127,8 +129,12 @@
|
||||
bitecount++
|
||||
if (amount_eaten >= m_bitesize)
|
||||
user.visible_message("<span class='notice'>[user] feeds [M] [src].</span>")
|
||||
if (!istype(M.loc, /turf))//held mobs don't see visible messages
|
||||
M << "<span class='notice'>[user] feeds you [src].</span>"
|
||||
else
|
||||
user.visible_message("<span class='notice'>[user] feeds [M] a tiny bit of [src]. <b>It looks full.</b></span>")
|
||||
if (!istype(M.loc, /turf))
|
||||
M << "<span class='notice'>[user] feeds you a tiny bit of [src]. <b>You feel pretty full!</b></span>"
|
||||
On_Consume(M)
|
||||
return 1
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user