[READY]Refactors reagent container types
This commit is contained in:
committed by
CitadelStationBot
parent
d5708c981a
commit
522b8383d8
@@ -48,15 +48,6 @@
|
||||
/obj/item/reagent_containers/afterattack(obj/target, mob/user , flag)
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/proc/reagentlist(obj/item/reagent_containers/snack) //Attack logs for regents in pills
|
||||
var/data
|
||||
if(snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries
|
||||
for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
|
||||
data += "[R.id]([R.volume] units); " //Using IDs because SOME chemicals(I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
|
||||
return data
|
||||
else
|
||||
return "No reagents"
|
||||
|
||||
/obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)
|
||||
if(!iscarbon(eater))
|
||||
return 0
|
||||
@@ -127,7 +118,11 @@
|
||||
reagents.clear_reagents()
|
||||
|
||||
/obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M)
|
||||
<<<<<<< HEAD
|
||||
if(is_open_container())
|
||||
reagents.chem_temp = max(reagents.chem_temp, 1000)
|
||||
reagents.handle_reactions()
|
||||
=======
|
||||
reagents.expose_temperature(1000)
|
||||
>>>>>>> 40699a8... [READY]Refactors reagent container types (#33470)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user