From 19eb57aa01a7a1ab9c2f00a2abeb6656e233608d Mon Sep 17 00:00:00 2001 From: Durandaal <125332955+Durandaal@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:10:53 -0600 Subject: [PATCH] changes --- code/global.dm | 1 - .../silicon/robot/robot_modules/station.dm | 29 +++++-------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/code/global.dm b/code/global.dm index f6fa0276c8c..b12750cefb4 100644 --- a/code/global.dm +++ b/code/global.dm @@ -137,7 +137,6 @@ var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J // Used by robots and robot preferences for regular modules. -//RS Edit || Ports CHOMPStation 6626 var/list/robot_module_types = list( "Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security", diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index cac048aef79..0e1b5f41c1b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -246,7 +246,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/roller_holder(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src) src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) + //src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/gripper/no_use/organ(src) src.modules += new /obj/item/weapon/gripper/medical(src) @@ -273,28 +273,22 @@ var/global/list/robot_modules = list( var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000) synths += medicine - var/obj/item/stack/medical/advanced/clotting/C = new (src) //RS Edit || ports CHOMPStation 6626 - var/obj/item/stack/nanopaste/N = new /obj/item/stack/nanopaste(src) var/obj/item/stack/medical/advanced/bruise_pack/B = new /obj/item/stack/medical/advanced/bruise_pack(src) var/obj/item/stack/medical/advanced/ointment/O = new /obj/item/stack/medical/advanced/ointment(src) //VoreStation edit: we have burn surgeries so they should be able to do them - //RS Edit start || ports CHOMPStation 6626 - C.uses_charge = 1 - C.charge_costs = list(5000) - C.synths = list(medicine) - //RS Edit end - N.uses_charge = 1 - N.charge_costs = list(1000) - N.synths = list(medicine) + var/obj/item/stack/medical/splint/S = new /obj/item/stack/medical/splint(src) + + S.uses_charge = 1 + S.charge_costs = list(1000) + S.synths = list(medicine) B.uses_charge = 1 B.charge_costs = list(1000) B.synths = list(medicine) O.uses_charge = 1 O.charge_costs = list(1000) O.synths = list(medicine) - src.modules += C - src.modules += N src.modules += B src.modules += O + src.modules += S src.modules += new /obj/item/device/dogborg/sleeper/trauma(src) src.emag += new /obj/item/weapon/dogborg/pounce(src) @@ -325,7 +319,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/roller_holder(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/crisis(src) src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) + //src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/gripper/no_use/organ(src) src.modules += new /obj/item/weapon/gripper/medical(src) @@ -353,15 +347,9 @@ var/global/list/robot_modules = list( var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(30000) //RS Edit || Ports CHOMPStation 6626 synths += medicine - var/obj/item/stack/medical/advanced/clotting/C = new (src) //RS Edit || ports CHOMPStation 6626 var/obj/item/stack/medical/advanced/ointment/O = new /obj/item/stack/medical/advanced/ointment(src) var/obj/item/stack/medical/advanced/bruise_pack/B = new /obj/item/stack/medical/advanced/bruise_pack(src) var/obj/item/stack/medical/splint/S = new /obj/item/stack/medical/splint(src) - //RS Edit start || ports CHOMPStation 6626 - C.uses_charge = 1 - C.charge_costs = list(5000) - C.synths = list(medicine) - //RS Edit end O.uses_charge = 1 O.charge_costs = list(1000) O.synths = list(medicine) @@ -371,7 +359,6 @@ var/global/list/robot_modules = list( S.uses_charge = 1 S.charge_costs = list(1000) S.synths = list(medicine) - src.modules += C src.modules += O src.modules += B src.modules += S