mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 07:08:55 +01:00
powder that makes you say yes
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user