mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Cooking and Smallmob tweaks (#1825)
Just an assorted package of little things: Scales down the deep fryer, reducing its power usage, oil reservoir and cooking containers. Should help with complaints about power usage Fixes up numbers so that cookers heat up in 15 minutes as intended Adjusts the normal size of all conbination cooking items, so its harder to reach crazy sizes Removes some debug messages Fixes user not being populated in get_scooped procs, which was preventing the special "X climbs onto Y" message from appearing when a mouse drags themselves onto a human adds passtable code to girders and empty machine frames, allowing small mobs to crawl over them and projectiles to sometimes (50% chance) pass over
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
|
||||
/mob/living/simple_animal/lizard/attack_hand(mob/living/carbon/human/M as mob)
|
||||
if (src.stat == DEAD)//If the creature is dead, we don't pet it, we just pickup the corpse on click
|
||||
get_scooped(M)
|
||||
get_scooped(M, usr)
|
||||
return
|
||||
else
|
||||
..()
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
|
||||
/mob/living/simple_animal/mouse/attack_hand(mob/living/carbon/human/M as mob)
|
||||
if (src.stat == DEAD)//If the mouse is dead, we don't pet it, we just pickup the corpse on click
|
||||
get_scooped(M)
|
||||
get_scooped(M, usr)
|
||||
return
|
||||
else
|
||||
..()
|
||||
@@ -150,7 +150,7 @@
|
||||
if(!istype(H) || !Adjacent(H)) return ..()
|
||||
|
||||
if(H.a_intent == "help")
|
||||
get_scooped(H)
|
||||
get_scooped(H, usr)
|
||||
return
|
||||
else
|
||||
return ..()
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
/mob/living/simple_animal/mushroom/attack_hand(mob/living/carbon/human/M as mob)
|
||||
if (src.stat == DEAD)//If the creature is dead, we don't pet it, we just pickup the corpse on click
|
||||
get_scooped(M)
|
||||
get_scooped(M, usr)
|
||||
return
|
||||
else
|
||||
..()
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
|
||||
//We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once
|
||||
if (data["cooked"] != 1)
|
||||
world << "cooked is [data["cooked"]]"
|
||||
if (!messaged)
|
||||
M << "Ugh, this raw [name] tastes disgusting."
|
||||
nutriment_factor *= 0.5
|
||||
@@ -102,7 +101,6 @@
|
||||
|
||||
//Handles setting the temperature when oils are mixed
|
||||
/datum/reagent/nutriment/coating/mix_data(var/newdata, var/newamount)
|
||||
world << "Coating mixed with new coating, setting cooked to [newdata["cooked"]]"
|
||||
if (!data)
|
||||
data = list()
|
||||
|
||||
@@ -265,7 +263,6 @@
|
||||
|
||||
/datum/reagent/nutriment/triglyceride/oil/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
var/dfactor = heatdamage(M)
|
||||
world << "Oil touch. dfactor [dfactor]"
|
||||
if (dfactor)
|
||||
M.take_organ_damage(0, removed * 1.5 * dfactor)
|
||||
data["temperature"] -= (6 * removed) / (1 + volume*0.1)//Cools off as it burns you
|
||||
|
||||
@@ -281,8 +281,6 @@
|
||||
/obj/structure/reagent_dispensers/cookingoil/New()
|
||||
..()
|
||||
reagents.add_reagent("cornoil",capacity)
|
||||
world << "Cooking oil spawned!"
|
||||
world << "[src] spawned in [src.loc], [src.x], [src.y], [src.z]"
|
||||
|
||||
/obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj)
|
||||
if(Proj.get_structure_damage())
|
||||
|
||||
Reference in New Issue
Block a user