From cfdbfd6b7a153511b57ff48da9122afa0d603f25 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 25 Aug 2022 18:54:05 -0400 Subject: [PATCH 1/2] drill and body design disks for the surgeon borgs --- code/modules/mob/living/silicon/robot/drone/drone_items.dm | 5 +++++ .../mob/living/silicon/robot/robot_modules/station_vr.dm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index f36e2067ee..313735409f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -99,8 +99,13 @@ /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/blood, +<<<<<<< HEAD /obj/item/device/nif, //Chompedit Add Nif handling /obj/item/stack/material/phoron +======= + /obj/item/stack/material/phoron, + /obj/item/weapon/disk/body_record //Vorestation Edit: this lets you get an empty sleeve or help someone else +>>>>>>> 88aff386e2... Merge pull request #13556 from TankTheBirb/moretraumafix ) /obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc 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 6acc64835c..2d538e52bd 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 @@ -403,6 +403,11 @@ src.modules += new /obj/item/weapon/surgical/FixOVein/cyborg(src) src.modules += new /obj/item/weapon/surgical/bonesetter/cyborg(src) src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src) +<<<<<<< HEAD +======= + src.modules += new /obj/item/weapon/surgical/surgicaldrill/cyborg(src) + src.modules += new /obj/item/weapon/surgical/bioregen/cyborg(src) //let them succ +>>>>>>> 88aff386e2... Merge pull request #13556 from TankTheBirb/moretraumafix src.modules += new /obj/item/weapon/gripper/no_use/organ(src) src.modules += new /obj/item/weapon/gripper/medical(src) src.modules += new /obj/item/weapon/shockpaddles/robot(src) From 5fd62fc5d228c019a10602d89867366f1b069018 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 28 Aug 2022 19:13:51 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/living/silicon/robot/drone/drone_items.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 313735409f..a5da95cd6a 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -99,13 +99,9 @@ /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/blood, -<<<<<<< HEAD /obj/item/device/nif, //Chompedit Add Nif handling - /obj/item/stack/material/phoron -======= /obj/item/stack/material/phoron, /obj/item/weapon/disk/body_record //Vorestation Edit: this lets you get an empty sleeve or help someone else ->>>>>>> 88aff386e2... Merge pull request #13556 from TankTheBirb/moretraumafix ) /obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc