diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 330f69dd..dd3ff919 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -267,6 +267,16 @@ hasprimary = TRUE primary_color = "#222222" +/obj/item/clothing/neck/petcollar/locked/security + name = "security collar" + desc = "For when you need to show everyone who your pet belongs to." + icon_state = "seccollar" + item_state = "seccollar" + hasprimary = FALSE + hassecondary = FALSE + hastertiary = FALSE + + /obj/item/key/collar name = "Collar Key" desc = "A key for a tiny lock on a collar or bag." diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index b3b21fe3..629548bc 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -16,7 +16,9 @@ /obj/item/secbat = 5) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, - /obj/item/ssword_kit = 1) + /obj/item/ssword_kit = 1, + /obj/item/clothing/neck/petcollar/locked/security = 3, + /obj/item/electropack/shockcollar/security = 3) premium = list(/obj/item/coin/antagtoken = 1, /obj/item/clothing/head/helmet/blueshirt = 1, /obj/item/clothing/suit/armor/vest/blueshirt = 1, diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi index 2e832ddb..cf0d15b9 100644 Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 0bdaa36e..83506180 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index 9d0757e2..fe5fcc0e 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -81,3 +81,9 @@ user << browse(dat, "window=radio") onclose(user, "radio") return + +/obj/item/electropack/shockcollar/security + name = "security shock collar" + desc = "A reinforced security collar. It has two electrodes that press against the neck, for disobedient pets." + icon_state = "shockseccollar" + item_state = "shockseccollar" diff --git a/modular_citadel/icons/mob/citadel/neck.dmi b/modular_citadel/icons/mob/citadel/neck.dmi index 488623b3..a6427fd5 100644 Binary files a/modular_citadel/icons/mob/citadel/neck.dmi and b/modular_citadel/icons/mob/citadel/neck.dmi differ diff --git a/modular_citadel/icons/obj/clothing/cit_neck.dmi b/modular_citadel/icons/obj/clothing/cit_neck.dmi index abccd4a1..40031792 100644 Binary files a/modular_citadel/icons/obj/clothing/cit_neck.dmi and b/modular_citadel/icons/obj/clothing/cit_neck.dmi differ