From 6ca761f10f61bbb57b0ba7c4e003679c45a37ec2 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 7 Aug 2022 15:52:22 -0400 Subject: [PATCH 1/5] Adjusts dogborg modules to be inline with regular modules --- .../silicon/robot/robot_modules/station_vr.dm | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) 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 327743f4cf..b06daf3b43 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 @@ -299,21 +299,36 @@ src.modules += new /obj/item/device/healthanalyzer(src) // See who's hurt specificially. src.modules += new /obj/item/borg/sight/hud/med(src) //See who's hurt generally. src.modules += new /obj/item/weapon/reagent_containers/syringe(src) //In case the chemist is nice! +<<<<<<< HEAD src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)//For holding the chemicals when the chemist is nice +======= + src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)//For holding the chemicals when the chemist is nice, made it the large variant in 2022 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people. src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life src.modules += new /obj/item/weapon/inflatable_dispenser/robot(src) //This is kinda important for rescuing people without making it worse for everyone + src.modules += new /obj/item/weapon/gripper/medical(src) //Let them do literally anything in medbay other than patch external damage and lick people + src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) //dropper is nice to have for so much actually src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce src.modules += new /obj/item/weapon/gripper/medical(src)//Now you can set up cyro or make peri. //CHOMPEdit +<<<<<<< HEAD var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000) //CHOMPedit +======= + var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000) +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync synths += medicine var/obj/item/stack/medical/advanced/clotting/C = new (src) + var/obj/item/stack/medical/splint/S = new /obj/item/stack/medical/splint(src) C.uses_charge = 1 - C.charge_costs = list(1000) + C.charge_costs = list(5000) C.synths = list(medicine) + S.uses_charge = 1 + S.charge_costs = list(1000) + S.synths = list(medicine) src.modules += C + src.modules += S var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" @@ -543,9 +558,20 @@ //Added a circuit gripper src.modules += new /obj/item/weapon/gripper/circuit(src) src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src) + //src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(src) //these are on the normal one, but do not appear to have a purpose other than borging + //src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src) //so I am leaving them here but commented out because robotics no do the borging w/o medical + src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) //destructive analyzer option for pref respect while also being able to do job src.modules += new /obj/item/weapon/gripper/no_use/mech(src) +<<<<<<< HEAD src.modules += new /obj/item/weapon/melee/baton/slime/robot(src) //Chompedit this was missing for some strange reason. src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src) //Chompedit This also. +======= + src.modules += new /obj/item/weapon/shockpaddles/robot/jumper(src) //unkilling synths may be important actually + src.modules += new /obj/item/weapon/melee/baton/slime/robot(src) //save the xenobio from themselves + src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src) //save the xenobio from themselves from a distance + src.modules += new /obj/item/device/xenoarch_multi_tool(src) //go find fancy rock + src.modules += new /obj/item/weapon/pickaxe/excavationdrill(src) //go get fancy rock +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync src.emag = new /obj/item/weapon/hand_tele(src) var/datum/matter_synth/water = new /datum/matter_synth(500) @@ -640,27 +666,47 @@ //Painfully slow charger regen but high capacity. Also starts with low amount. var/datum/matter_synth/metal = new /datum/matter_synth/metal() metal.name = "Steel reserves" +<<<<<<< HEAD metal.recharge_rate = 1000 //CHOMPedit Make less slow +======= + metal.recharge_rate = 500 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync metal.max_energy = 50000 metal.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/glass = new /datum/matter_synth/glass() glass.name = "Glass reserves" +<<<<<<< HEAD glass.recharge_rate = 1000 //CHOMPedit Make less slow +======= + glass.recharge_rate = 500 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync glass.max_energy = 50000 glass.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/wood = new /datum/matter_synth/wood() wood.name = "Wood reserves" +<<<<<<< HEAD wood.recharge_rate = 1000 //CHOMPedit Make less slow +======= + wood.recharge_rate = 500 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync wood.max_energy = 50000 wood.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/plastic = new /datum/matter_synth/plastic() plastic.name = "Plastic reserves" +<<<<<<< HEAD plastic.recharge_rate = 1000 //CHOMPedit Make less slow +======= + plastic.recharge_rate = 500 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync plastic.max_energy = 50000 plastic.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/plasteel = new /datum/matter_synth/plasteel() plasteel.name = "Plasteel reserves"// Adding plasteel synthesizer to move in-line with Engiborg. +<<<<<<< HEAD plasteel.recharge_rate = 1000 //CHOMPedit Make less slow +======= + plasteel.recharge_rate = 250 +>>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync plasteel.max_energy = 20000 plasteel.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/water = new /datum/matter_synth(500) From ca9cf28abf91639fee372d479d5592c447e5f6d9 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 25 Aug 2022 18:46:47 -0400 Subject: [PATCH 2/5] powder that makes you say yes --- .../silicon/robot/robot_modules/station_vr.dm | 33 ------------------- 1 file changed, 33 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 b06daf3b43..c485de808b 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 @@ -299,11 +299,7 @@ src.modules += new /obj/item/device/healthanalyzer(src) // See who's hurt specificially. src.modules += new /obj/item/borg/sight/hud/med(src) //See who's hurt generally. src.modules += new /obj/item/weapon/reagent_containers/syringe(src) //In case the chemist is nice! -<<<<<<< HEAD - src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)//For holding the chemicals when the chemist is nice -======= src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)//For holding the chemicals when the chemist is nice, made it the large variant in 2022 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people. src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life src.modules += new /obj/item/weapon/inflatable_dispenser/robot(src) //This is kinda important for rescuing people without making it worse for everyone @@ -312,11 +308,7 @@ src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce src.modules += new /obj/item/weapon/gripper/medical(src)//Now you can set up cyro or make peri. //CHOMPEdit -<<<<<<< HEAD var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000) //CHOMPedit -======= - var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000) ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync synths += medicine var/obj/item/stack/medical/advanced/clotting/C = new (src) @@ -562,16 +554,11 @@ //src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src) //so I am leaving them here but commented out because robotics no do the borging w/o medical src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) //destructive analyzer option for pref respect while also being able to do job src.modules += new /obj/item/weapon/gripper/no_use/mech(src) -<<<<<<< HEAD - src.modules += new /obj/item/weapon/melee/baton/slime/robot(src) //Chompedit this was missing for some strange reason. - src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src) //Chompedit This also. -======= src.modules += new /obj/item/weapon/shockpaddles/robot/jumper(src) //unkilling synths may be important actually src.modules += new /obj/item/weapon/melee/baton/slime/robot(src) //save the xenobio from themselves src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src) //save the xenobio from themselves from a distance src.modules += new /obj/item/device/xenoarch_multi_tool(src) //go find fancy rock src.modules += new /obj/item/weapon/pickaxe/excavationdrill(src) //go get fancy rock ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync src.emag = new /obj/item/weapon/hand_tele(src) var/datum/matter_synth/water = new /datum/matter_synth(500) @@ -666,47 +653,27 @@ //Painfully slow charger regen but high capacity. Also starts with low amount. var/datum/matter_synth/metal = new /datum/matter_synth/metal() metal.name = "Steel reserves" -<<<<<<< HEAD metal.recharge_rate = 1000 //CHOMPedit Make less slow -======= - metal.recharge_rate = 500 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync metal.max_energy = 50000 metal.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/glass = new /datum/matter_synth/glass() glass.name = "Glass reserves" -<<<<<<< HEAD glass.recharge_rate = 1000 //CHOMPedit Make less slow -======= - glass.recharge_rate = 500 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync glass.max_energy = 50000 glass.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/wood = new /datum/matter_synth/wood() wood.name = "Wood reserves" -<<<<<<< HEAD wood.recharge_rate = 1000 //CHOMPedit Make less slow -======= - wood.recharge_rate = 500 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync wood.max_energy = 50000 wood.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/plastic = new /datum/matter_synth/plastic() plastic.name = "Plastic reserves" -<<<<<<< HEAD plastic.recharge_rate = 1000 //CHOMPedit Make less slow -======= - plastic.recharge_rate = 500 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync plastic.max_energy = 50000 plastic.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/plasteel = new /datum/matter_synth/plasteel() plasteel.name = "Plasteel reserves"// Adding plasteel synthesizer to move in-line with Engiborg. -<<<<<<< HEAD plasteel.recharge_rate = 1000 //CHOMPedit Make less slow -======= - plasteel.recharge_rate = 250 ->>>>>>> e07abfda52... Merge pull request #13456 from TankTheBirb/Borg-Module-Sync plasteel.max_energy = 20000 plasteel.energy = 40000 //CHOMPedit Make less awful var/datum/matter_synth/water = new /datum/matter_synth(500) From 3a9faa61ddb47a47de2a1ac9e6f457625111a91b Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 28 Aug 2022 17:52:34 -0400 Subject: [PATCH 3/5] powder that makes you say yes --- .../modules/mob/living/silicon/robot/robot_modules/station_vr.dm | 1 - 1 file changed, 1 deletion(-) 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 c485de808b..4e86b2883a 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 @@ -351,7 +351,6 @@ P.charge_costs = list(1000) P.synths = list(medicine) S.uses_charge = 1 - S.charge_costs = list(1000) S.synths = list(medicine) src.modules += O src.modules += P From d56c318013fbcbb01c702035fab5f3e7130534e8 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 28 Aug 2022 17:58:52 -0400 Subject: [PATCH 4/5] powder that makes you say yes --- .../modules/mob/living/silicon/robot/robot_modules/station_vr.dm | 1 + 1 file changed, 1 insertion(+) 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 4e86b2883a..c485de808b 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 @@ -351,6 +351,7 @@ P.charge_costs = list(1000) P.synths = list(medicine) S.uses_charge = 1 + S.charge_costs = list(1000) S.synths = list(medicine) src.modules += O src.modules += P From e42f26c6952abf652bd157a14c519fb5f4c47fe2 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 28 Aug 2022 18:51:19 -0400 Subject: [PATCH 5/5] powder that makes you say yes --- .../silicon/robot/robot_modules/station_vr.dm | 18 ------------------ 1 file changed, 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 c485de808b..d2829fc6bf 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 @@ -341,24 +341,6 @@ B.water = water src.modules += B - var/obj/item/stack/medical/advanced/ointment/O = new /obj/item/stack/medical/advanced/ointment(src) - var/obj/item/stack/medical/advanced/bruise_pack/P = new /obj/item/stack/medical/advanced/bruise_pack(src) - var/obj/item/stack/medical/splint/S = new /obj/item/stack/medical/splint(src) - O.uses_charge = 1 - O.charge_costs = list(1000) - O.synths = list(medicine) - P.uses_charge = 1 - P.charge_costs = list(1000) - P.synths = list(medicine) - S.uses_charge = 1 - S.charge_costs = list(1000) - S.synths = list(medicine) - src.modules += O - src.modules += P - src.modules += S - -// End YW Edit - R.icon = 'icons/mob/widerobot_vr.dmi' src.modules += new /obj/item/weapon/dogborg/pounce(src) //CHOMPEdit - Switch to the more balanced pounce module