ice ore spawns now

shiptest-ss13 · Nov 1, 2023 · 12d8d47 · 12d8d47
1 parent 386e79d
commit 12d8d47
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/code/game/machinery/outpost_electrolyzer.dm b/code/game/machinery/outpost_electrolyzer.dm
@@ -1,5 +1,6 @@
 //allows production of hydrogen from ice chunks
 #define MOLS_PER_ICE 50
+
 /obj/machinery/mineral/electrolyzer_unloader
 	name = "ice unloading machine"
 	icon = 'icons/obj/machines/mining_machines.dmi'
@@ -132,14 +133,21 @@
 	pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
 	var/molstomakedebug //removewhendone
 
+
+/obj/machinery/atmospherics/components/binary/electrolyzer_out/process_atmos()
+	update_parents()
+
 /obj/machinery/atmospherics/components/binary/electrolyzer_out/proc/electrolyze_item(obj/item/I)
 	var/datum/gas_mixture/air1 = airs[1] //hydrogen out
 	var/datum/gas_mixture/air2 = airs[2] //oxygen out
 	var/obj/item/stack/ore/ice/S = I
 	var/molstomake = S.get_amount() * MOLS_PER_ICE
 	molstomakedebug = molstomake
 	air1.adjust_moles (GAS_HYDROGEN, molstomake)
+	air1.set_temperature (T20C)
 	air2.adjust_moles (GAS_O2, molstomake / 2)
+	air2.set_temperature (T20C)
+	update_parents()
 /*
 /obj/machinery/mineral/electrolyzer
 	name = "ice crusher"

diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
@@ -154,7 +154,7 @@
 
 /turf/closed/mineral/random
 	var/list/mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10,
-		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40, /obj/item/stack/ore/titanium = 11,
+		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40, /obj/item/stack/ore/titanium = 11, /obj/item/stack/ore/ice = 15,
 		/turf/closed/mineral/gibtonite = 4, /obj/item/stack/ore/bluespace_crystal = 1)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 13
@@ -255,7 +255,7 @@
 
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10, /obj/item/stack/ore/titanium = 11,
-		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
+		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40, /obj/item/stack/ore/ice = 10,
 		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /obj/item/stack/ore/bluespace_crystal = 1)
 
 /turf/closed/mineral/ice
@@ -273,15 +273,15 @@
 	opacity = FALSE
 	light_range = 2
 	light_power = 1
-
+	mineralSpawnChanceList = list(/obj/item/stack/ore/ice = 15)
 
 /turf/closed/mineral/random/snow/underground
 	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
 	// abundant ore
 	mineralChance = 20
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 10, /obj/item/stack/ore/diamond = 4, /obj/item/stack/ore/gold = 20, /obj/item/stack/ore/titanium = 22,
-		/obj/item/stack/ore/silver = 24, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 20, /obj/item/stack/ore/bananium = 1,
+		/obj/item/stack/ore/silver = 24, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 20, /obj/item/stack/ore/bananium = 1, /obj/item/stack/ore/ice = 10,
 		/turf/closed/mineral/gibtonite/ice/icemoon = 8, /obj/item/stack/ore/bluespace_crystal = 2)
 
 /turf/closed/mineral/random/snow/high_chance