Merge branch 'pr/20'

2019-07-28 23:28:19 +01:00
parent 31709938c6 0b87c1b21f
commit d080446a77
82 changed files with 1119 additions and 497 deletions
@@ -434,3 +434,11 @@ datum/gear/darksabresheath
 	category = SLOT_NECK
 	path = /obj/item/bedsheet/captain
 	ckeywhitelist = list("tikibomb")
+
+/datum/gear/borgplush
+	name = "Robot Plush"
+	category = SLOT_IN_BACKPACK
+	/obj/item/toy/plush/borgplushie
+	ckeywhitelist = list("nicholaiavenicci")
+
+
@@ -23,11 +23,6 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/lampplushie

-/datum/gear/plushrng
-	name = "Random plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/random
-
 /datum/gear/tennis
 	name = "Classic Tennis Ball"
 	category = SLOT_IN_BACKPACK
@@ -84,8 +79,24 @@
 	path = /obj/item/toy/katana
 	cost = 3

-//datum/gear/lumeyes
-//	name = "Luminescent eye auto surgeon"
-//	category = SLOT_IN_BACKPACK
-//	path = /obj/item/autosurgeon/gloweyes
-//	cost = 4
+/datum/gear/box
+	name = "Spare box"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/storage/box
+	cost = 2
+
+/datum/gear/crowbar
+	name = "Pocket Crowbar"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/crowbar
+	cost = 2
+
+/datum/gear/tapeplayer
+	name = "Taperecorder"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/taperecorder
+
+/datum/gear/tape
+	name = "Spare cassette tape"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/tape/random