From ff63ec73da82719aa64fc4f787291e171698f27a Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Fri, 20 May 2016 19:32:49 -0400
Subject: [PATCH] Ported collars from VirgoStation

* Six types of regular collar and one holocollar
* Collars attach to clothing or can be worn in exosuit slot by nude people.
* Holocollar can have its tag description set.
---
 .../loadout/loadout_accessories_vr.dm         |  27 +++++++
 .../under/accessories/accessory_vr.dm         |  71 ++++++++++++++++++
 icons/obj/clothing/collars_vr.dmi             | Bin 0 -> 3711 bytes
 vorestation.dme                               |   2 +
 4 files changed, 100 insertions(+)
 create mode 100644 code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
 create mode 100644 code/modules/clothing/under/accessories/accessory_vr.dm
 create mode 100644 icons/obj/clothing/collars_vr.dmi

diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
new file mode 100644
index 0000000000..769d04b982
--- /dev/null
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
@@ -0,0 +1,27 @@
+// Collars
+
+/datum/gear/collar
+	display_name = "Collar, Silver"
+	path = /obj/item/clothing/accessory/collar/silver
+	slot = slot_tie
+	sort_category = "Accessories"
+
+/datum/gear/collar/golden
+	display_name = "Collar, Golden"
+	path = /obj/item/clothing/accessory/collar/gold
+
+/datum/gear/collar/bell
+	display_name = "Collar, Bell"
+	path = /obj/item/clothing/accessory/collar/bell
+
+/datum/gear/collar/shock
+	display_name = "Collar, Shock"
+	path = /obj/item/clothing/accessory/collar/shock
+
+/datum/gear/collar/spike
+	display_name = "Collar, Spike"
+	path = /obj/item/clothing/accessory/collar/spike
+
+/datum/gear/collar/pink
+	display_name = "Collar, Pink"
+	path = /obj/item/clothing/accessory/collar/pink
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
new file mode 100644
index 0000000000..455bbbccd5
--- /dev/null
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -0,0 +1,71 @@
+//
+// Collars and such like that
+//
+
+/obj/item/clothing/accessory/collar
+	slot_flags = SLOT_TIE | SLOT_OCLOTHING
+	icon = 'icons/obj/clothing/collars_vr.dmi'
+	icon_override = 'icons/obj/clothing/collars_vr.dmi'
+
+/obj/item/clothing/accessory/collar/silver
+	name = "Silver tag collar"
+	desc = "A collar for your little pets... or the big ones."
+	icon_state = "collar_blk"
+	item_state = "collar_blk_overlay"
+	overlay_state = "collar_blk_overlay"
+
+/obj/item/clothing/accessory/collar/gold
+	name = "Golden tag collar"
+	desc = "A collar for your little pets... or the big ones."
+	icon_state = "collar_gld"
+	item_state = "collar_gld_overlay"
+	overlay_state = "collar_gld_overlay"
+
+/obj/item/clothing/accessory/collar/bell
+	name = "Bell collar"
+	desc = "A collar with a tiny bell hanging from it, purrfect furr kitties."
+	icon_state = "collar_bell"
+	item_state = "collar_bell_overlay"
+	overlay_state = "collar_bell_overlay"
+
+/obj/item/clothing/accessory/collar/shock
+	name = "Shock collar"
+	desc = "A collar used to ease hungry predators."
+	icon_state = "collar_shk"
+	item_state = "collar_shk_overlay"
+	overlay_state = "collar_shk_overlay"
+
+/obj/item/clothing/accessory/collar/spike
+	name = "Spiked collar"
+	desc = "A collar with spikes that look as sharp as your teeth."
+	icon_state = "collar_spik"
+	item_state = "collar_spik_overlay"
+	overlay_state = "collar_spik_overlay"
+
+/obj/item/clothing/accessory/collar/pink
+	name = "Pink collar"
+	desc = "This collar will make your pets look FA-BU-LOUS."
+	icon_state = "collar_pnk"
+	item_state = "collar_pnk_overlay"
+	overlay_state = "collar_pnk_overlay"
+
+/obj/item/clothing/accessory/collar/holo
+	name = "Holo-collar"
+	desc = "An expensive holo-collar for the modern day pet."
+	icon_state = "collar_holo"
+	item_state = "collar_holo_overlay"
+	overlay_state = "collar_holo_overlay"
+
+/obj/item/clothing/accessory/collar/holo/attack_self(mob/user as mob)
+	user << "<span class='notice'>[name]'s interface is projected onto your hand.</span>"
+
+	var/str = copytext(reject_bad_text(input(user,"Tag text?","Set tag","")),1,MAX_NAME_LEN)
+
+	if(!str || !length(str))
+		user << "<span class='notice'>[name]'s tag set to be blank.</span>"
+		name = initial(name)
+		desc = initial(desc)
+	else
+		user << "<span class='notice'>You set the [name]'s tag to '[str]'.</span>"
+		name = initial(name) + " ([str])"
+		desc = initial(desc) + " The tag says \"[str]\"."
diff --git a/icons/obj/clothing/collars_vr.dmi b/icons/obj/clothing/collars_vr.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0053dd4bc103f8c64dc634147404e31840e82289
GIT binary patch
literal 3711
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
QA0@<Ze*mKDo2c{u1bu}9OaK4?

literal 0
HcmV?d00001

diff --git a/vorestation.dme b/vorestation.dme
index d07447c36d..a15365c1b6 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1041,6 +1041,7 @@
 #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm"
 #include "code\modules\client\preference_setup\loadout\loadout.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_accessories_vr.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_ears.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm"
@@ -1132,6 +1133,7 @@
 #include "code\modules\clothing\under\shorts.dm"
 #include "code\modules\clothing\under\syndicate.dm"
 #include "code\modules\clothing\under\accessories\accessory.dm"
+#include "code\modules\clothing\under\accessories\accessory_vr.dm"
 #include "code\modules\clothing\under\accessories\armband.dm"
 #include "code\modules\clothing\under\accessories\badges.dm"
 #include "code\modules\clothing\under\accessories\holster.dm"