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

Sorry, Circuits. (Only slightly.)

Browse Source
This commit is contained in:
The0bserver
2020-09-01 02:42:43 -04:00
parent 89b837461e
commit e36f93baeb
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -496,7 +496,7 @@
var/water_amt = reagent_source.reagents.get_reagent_amount(/datum/reagent/water) * transfer_amount / reagent_source.reagents.total_volume var/water_amt = reagent_source.reagents.get_reagent_amount(/datum/reagent/water) * transfer_amount / reagent_source.reagents.total_volume
H.adjustWater(round(water_amt)) H.adjustWater(round(water_amt))
reagent_source.reagents.remove_reagent(/datum/reagent/water, water_amt) reagent_source.reagents.remove_reagent(/datum/reagent/water, water_amt)
reagent_source.reagents.trans_to(H.reagents, transfer_amount, transfered_by = user) reagent_source.reagents.trans_to(H.reagents, transfer_amount)
if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill)) if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill))
qdel(reagent_source) qdel(reagent_source)
lastuser = user lastuser = user
code/modules/integrated_electronics/subtypes/reagents.dm
+15 -14
View File
@@ -19,25 +19,26 @@
// Hydroponics trays have no reagents holder and handle reagents in their own snowflakey way. // Hydroponics trays have no reagents holder and handle reagents in their own snowflakey way.
// This is a dirty hack to make injecting reagents into them work. // This is a dirty hack to make injecting reagents into them work.
// TODO: refactor that. // TODO: refactor that.
/obj/item/integrated_circuit/reagent/proc/inject_tray(obj/machinery/hydroponics/tray, atom/movable/source, amount) //Time for someone to refactor this. Trays can now hold reagents.
var/atom/movable/acting_object = get_object() //obj/item/integrated_circuit/reagent/proc/inject_tray(obj/machinery/hydroponics/tray, atom/movable/source, amount)
var/list/trays = list(tray) //var/atom/movable/acting_object = get_object()
var/visi_msg = "[acting_object] transfers fluid into [tray]" //var/list/trays = list(tray)
//var/visi_msg = "[acting_object] transfers fluid into [tray]"
acting_object.visible_message("<span class='notice'>[visi_msg].</span>") //acting_object.visible_message("<span class='notice'>[visi_msg].</span>")
playsound(loc, 'sound/effects/slosh.ogg', 25, 1) //playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
var/split = round(amount/trays.len) //var/split = round(amount/trays.len)
for(var/obj/machinery/hydroponics/H in trays) //for(var/obj/machinery/hydroponics/H in trays)
var/datum/reagents/temp_reagents = new /datum/reagents() //var/datum/reagents/temp_reagents = new /datum/reagents()
temp_reagents.my_atom = H //temp_reagents.my_atom = H
source.reagents.trans_to(temp_reagents, split) //source.reagents.trans_to(temp_reagents, split)
H.on_hydroponics_apply(temp_reagents) //H.on_hydroponics_apply(temp_reagents)
temp_reagents.clear_reagents() //temp_reagents.clear_reagents()
qdel(temp_reagents) //qdel(temp_reagents)
/obj/item/integrated_circuit/reagent/injector /obj/item/integrated_circuit/reagent/injector
name = "integrated hypo-injector" name = "integrated hypo-injector"