Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

2018-03-20 23:00:12 -05:00
parent 2bb09bef5f 0d4e7f73f4
commit f3a806923c
1355 changed files with 3112 additions and 2226 deletions
@@ -16,6 +16,7 @@
 	name = "Shockcollar"
 	id = "shockcollar"
 	build_type = AUTOLATHE
+	build_path = /obj/item/device/electropack/shockcollar
 	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
 	category = list("hacked", "Misc")
 	
@@ -28,4 +28,6 @@
 			else
 				to_chat(user,"<span class='warning'>Remove the powercell first!</span>") //We make this check because the stunsword starts without a battery.
 		else
-			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
+			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
+
+
@@ -30,4 +30,8 @@
 	if(prob(30))
 		new /obj/item/clothing/suit/hooded/wintercoat(src)
 		new /obj/item/clothing/shoes/winterboots(src)
-	return
+	return
+
+/obj/structure/closet/wardrobe/curator/PopulateContents()
+	..()
+	new /obj/item/clothing/accessory/pocketprotector/full(src)