mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-29 16:19:36 +01:00
powder that makes you say yes
This commit is contained in:
@@ -1033,12 +1033,7 @@
|
||||
R.verbs -= /mob/living/silicon/robot/proc/rest_style
|
||||
..()
|
||||
|
||||
<<<<<<< HEAD
|
||||
/obj/item/weapon/robot_module/robot/booze
|
||||
=======
|
||||
|
||||
/obj/item/weapon/robot_module/robot/clerical/butler/booze
|
||||
>>>>>>> a533de71c6... Merge pull request #14269 from Heroman3003/borg-event-stuff
|
||||
name = "BoozeHound robot module"
|
||||
can_be_pushed = 0
|
||||
sprites = list(
|
||||
|
||||
Reference in New Issue
Block a user