shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11919 from Ghommie/Ghommie-cit690

Browse Source 
Nerfing the bonus reagents from higher tier microwaves.
This commit is contained in:
kevinz000
2020-04-20 11:34:53 -07:00
committed by GitHub
parent 33cfb9a566 957e92ed8f
commit 893f57cb63
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks.dm
+1 -1
View File
@@ -285,7 +285,7 @@ All foods are distributed among various categories. Use common sense.
reagents.trans_to(S, reagents.total_volume)
if(cooking_efficiency && length(S.bonus_reagents))
for(var/r_id in S.bonus_reagents)
var/amount = S.bonus_reagents[r_id] * cooking_efficiency
var/amount = round(S.bonus_reagents[r_id] * cooking_efficiency)
if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
S.reagents.add_reagent(r_id, amount, tastes)
else
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+10 -7
View File
@@ -19,6 +19,7 @@
var/broken = 0 // 0, 1 or 2 // How broken is it???
var/max_n_of_items = 10
var/efficiency = 0
var/productivity = 0
var/datum/looping_sound/microwave/soundloop
var/list/ingredients = list() // may only contain /atom/movables
@@ -43,12 +44,14 @@
. = ..()
/obj/machinery/microwave/RefreshParts()
efficiency = 0
efficiency = 0.6
productivity = 0
max_n_of_items = 5
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
efficiency += M.rating
efficiency += M.rating * 0.4
productivity += M.rating
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
max_n_of_items = 10 * M.rating
break
max_n_of_items += M.rating * 5
/obj/machinery/microwave/examine(mob/user)
. = ..()
@@ -83,7 +86,7 @@
if(!(stat & (NOPOWER|BROKEN)))
. += "<span class='notice'>The status display reads:</span>"
. += "<span class='notice'>- Capacity: <b>[max_n_of_items]</b> items.<span>"
. += "<span class='notice'>- Cook time reduced by <b>[(efficiency - 1) * 25]%</b>.<span>"
. += "<span class='notice'>- Cook time reduced by <b>[(productivity - 1) * 25]%</b>.<span>"
/obj/machinery/microwave/update_icon_state()
if(broken)
@@ -240,7 +243,7 @@
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
return
if(prob(max((5 / efficiency) - 5, dirty * 5))) //a clean unupgraded microwave has no risk of failure
if(prob(dirty * 5 / (5 * efficiency))) //a clean unupgraded microwave has no risk of failure
muck()
return
for(var/obj/O in ingredients)
@@ -285,7 +288,7 @@
update_icon()
loop(MICROWAVE_MUCK, 4)
/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10
/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2)) // standard wait is 10
if(stat & (NOPOWER|BROKEN))
if(type == MICROWAVE_PRE)
pre_fail()