From 523897c17c3060888c2e085e40b2feaba65ee781 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sun, 7 Oct 2018 09:16:09 +0200 Subject: [PATCH 1/3] Dogborgs start with full water reserves. --- .../living/silicon/robot/robot_modules/station_vr.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 740cf1f20c..a0c9bb6bea 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -158,7 +158,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -228,7 +228,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -279,7 +279,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -333,7 +333,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += metal @@ -407,7 +407,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water synths += water @@ -482,7 +482,7 @@ water.name = "Water reserves" water.recharge_rate = 0 water.max_energy = 500 - water.energy = 0 + water.energy = 500 //Start full. R.water_res = water var/datum/matter_synth/wire = new /datum/matter_synth/wire() From 56ff73f57c8d14b1d7e75c067eefae6d74021d38 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sat, 13 Oct 2018 09:40:35 +0200 Subject: [PATCH 2/3] Makes water related changes shorter. --- .../silicon/robot/robot_modules/station_vr.dm | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index a0c9bb6bea..d26dc88ca9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -154,11 +154,9 @@ src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem. - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) //Starts full and has a max of 500 water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -224,11 +222,9 @@ src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -275,11 +271,9 @@ src.modules += new /obj/item/weapon/dogborg/swordtail(src) src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -329,11 +323,9 @@ glass.recharge_rate = 0 glass.max_energy = 50000 glass.energy = 0 - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += metal @@ -403,11 +395,9 @@ src.modules += new /obj/item/weapon/storage/part_replacer(src) src.emag = new /obj/item/weapon/hand_tele(src) - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water synths += water @@ -478,11 +468,9 @@ plastic.recharge_rate = 50 plastic.max_energy = 50000 plastic.energy = 5000 - var/datum/matter_synth/water = new /datum/matter_synth() + var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 - water.max_energy = 500 - water.energy = 500 //Start full. R.water_res = water var/datum/matter_synth/wire = new /datum/matter_synth/wire() From 617f747763111db9c6569f7a69edd4727f60bfa1 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Wed, 17 Oct 2018 20:52:22 +0200 Subject: [PATCH 3/3] Fix aronai being LAZY --- maps/tether/tether-03-surface3.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7ba93b95ce..64f70673f8 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -9670,7 +9670,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "qY" = ( -/obj/machinery/chem_master, +/obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "qZ" = (