sync with master

2018-01-31 07:02:55 -06:00
parent a7f0ffb6f0 18229f81b7
commit d7659ac6b2
45 changed files with 4136 additions and 317055 deletions
@@ -0,0 +1,6 @@
+/datum/supply_pack/misc/kinkmate
+	name = "Kinkmate supply Crate"
+	cost = 2000
+	contraband = TRUE
+	contains = list(/obj/item/vending_refill/kink)
+	crate_name = "Kinkmate supply crate"
@@ -77,3 +77,15 @@
 	name = "Kilt"
 	category = slot_w_uniform
 	path = /obj/item/clothing/under/kilt
+
+/datum/gear/secskirt
+	name = "Security skirt"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/security/skirt
+	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+
+/datum/gear/hosskirt
+	name = "Head of security's skirt"
+	category = slot_w_uniform
+	path = /obj/item/clothing/under/rank/head_of_security/skirt
+	restricted_roles = list("Head of Security")