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] 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