From b87a845e195e1e49ad30b18f2b504fd9c19e65a3 Mon Sep 17 00:00:00 2001
From: Jureiia <53306684+Jureiia@users.noreply.github.com>
Date: Sat, 29 Jul 2023 20:51:50 +0100
Subject: [PATCH] [Modular] Adds a thinner variant of the choker (#22685)

* The beginning and the end (hopefully)

* Update modular_skyrat/modules/customization/modules/clothing/neck/collars.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
---
 .../modules/GAGS/greyscale_configs.dm         |   9 +++++++++
 modular_skyrat/modules/GAGS/icons/collar.dmi  | Bin 1421 -> 1482 bytes
 .../GAGS/json_configs/collar/thinchoker.json  |  10 ++++++++++
 .../json_configs/collar/thinchoker_worn.json  |  10 ++++++++++
 .../modules/clothing/neck/collars.dm          |   8 ++++++++
 .../loadout_items/loadout_datum_neck.dm       |   4 ++++
 .../code/lewd_machinery/lustwish.dm           |   1 +
 7 files changed, 42 insertions(+)
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json

diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm
index cbf32bb5f02..23b611ff0d3 100644
--- a/modular_skyrat/modules/GAGS/greyscale_configs.dm
+++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm
@@ -333,6 +333,15 @@
 	name = "Choker (Worn)"
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/choker_worn.json'
 
+// Thin Choker
+/datum/greyscale_config/collar/thinchoker
+	name = "Thin Choker"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json'
+
+/datum/greyscale_config/collar/thinchoker/worn
+	name = "Thin Choker (Worn)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json'
+
 // Cow
 /datum/greyscale_config/collar/cow
 	name = "Cowbell Collar"
diff --git a/modular_skyrat/modules/GAGS/icons/collar.dmi b/modular_skyrat/modules/GAGS/icons/collar.dmi
index 2b1eb110335ecf1ea096773bed909aff2807e35d..011280e8164ed20059af26bc3ebd563982fc8ce6 100644
GIT binary patch
delta 1417
zcmV;41$O$43(5<S7YaZG0{{R3Kfbt`ks&StK9Nure_wBcFcig~;ZqQOU-rk>J<QPz
zBC|$F_Gkb*+gUAXoB8!uVW9EB9^P8=>pAD%+mvZECm-oDia*ovmuVx^F?x+=507DR
z5?jmN=H)pII1@W=yN$7>Wo|jCm6WC4sOo1D23w(x`}h<F-?}`oZatuLl4V|~Vp48w
zxq}p2fB2xP3pn$rBJg`c7i8@<uesVYtnz;pF)tD~2rz-=;y5D36%Mt5enAtf)d?Qh
znMJ&NO(^G@=DFWlD`W7SEe$0dbP+nC8TFcTB^8{sg%RsP6@fGIRwTd;l&rMe-KP<+
zK!3zoEgClJ2-=gIR7k-$sm2^Zd%7ZpH+jSCf0$mLakME{(n#7~8e#KQx*)MPfoa4Z
z8+b>em31@{^rCx*o<?LDxBtRFVJ#GjS4ry5000CWNkl<Zc%1Fs3znN86o6sD4aji=
z8M6Ti-9XRD{?}ABX(QJu#Ny-5^#7)FCL{)L2<CAMQdIze@5l^45!dXxKiiGg+#?&1
ze@hnMFx!Fcu3@w;#4;wk#p@y2M|e|+d&U%Lvt8n~feqm{J;lS{U4xp-2l!&c?J`~H
z4h(P&d%Zj_T@UPpE7;pJF54+>!QiJZI2_Ar18kp1vC;sq!40t;`!chN?H&Q%l*Tt0
zI-s@PC9#Fczx1EW?fhw=lyPqT+x?MDe;bqs=)CR#E9Z6h!OHlvBLDyZ*pSQ**2B-v
zJ52MwZRh3MMa4zgh>W0%@_qUGmkH8zeD(0n-uLrsLLYA-%C&PLy4g8#hfMwQJ6fg%
z{jj&trniZOkS>?jFDvNBM_Ew8-u3(T@w=De`fK0%Hr0s=mDfKez_yBJpZe3Cf4tn@
z^#cF^005A%b$-uPCQ47WRUMT-$;D;zS2EqTsA1KhirTq2VdzD6&C3x6V*5NJD_Hmc
z*`XH+LwWxYUtyfcESx{cr0)M-8hl(1i{#(<9dl`$xM>d%z|rdSU;5L2+;xxbs_*xo
zXUC94fTe!i@47o70hSs*!s{N#e>~2ZQ5_%v0NXlx{_%SI&p(cv;PA))#+Sr-4%ZwW
z;2T}STwa&0#uhx6`TzkOuF>{pD;VX|dn?y{=x##osSo`vsJ;*C`^XFc08rqF{9rtM
zZtcAf$PbnUSn7=dq2~suet6!_Q|19+d%f~kR(Y}yb$s`sy9s^zY$NAWf8T=Y`{3dP
zGynhq|C2@}tKP{b#<N#*8~Zle#H9C8o65!8_wnhZ`#181YXYp>x{niPO*&y0YB6C~
z4jQSq9TC{qkKf<M+DrGa=?7plo<DFF&~#DL2)prw>1O_=B+~~EH*|W_%%77+HsIMq
z8ioktV?+knoIWTdbDW>ue}Vu20001_$=R@CaM|gZmN;LxNGO`@Xt?;B`PPYqIJ5HE
z2BIwUd2&_C{3Nk;^Ox6;hLZuMZ_ZUfVgvvH0002s3zO-%^7TemlIsTxZ>%>W@3QUu
zlI8lrLXZn|tX*#;KOHxjjw@b2IJ@3RX@EPgPh31-c<=Rzi`Bj{e{K3XI$4<h&8TkA
zk@^6&J;eY3004mhiCmvpmX|Y6qiakRCyQh`%XXv022B%>zmsLN9IltVJ-59K?;1vl
z5as!?7w5}%GGDmih)4SfZwhg{S~q0>#20R7$MUJ61#eRyRNI2L?lN8Ix~T={ok_(|
zP8;0RfWx6O1{l3QZ=60$cw~FuKKq~@%d-jpIu?Miy?F-MPXWH#@c6}sK4mYJdjwcL
z1N{BOYMEwjJ2#%@YdDr)*C|`MV0@pm&tv&XOY8mB>5~lr0001dV~hM800000;4AnA
XZ5US<$;zl>00000NkvXXu0mjf4)ej%

delta 1356
zcmV-S1+)6f3ylkq7YZN*0{{R3H%hm|ks&StFOg6cf6s4%FdW6t^si|2zU+tB9p-2T
zky#@qI~u^wcGi`&&HVR=FmUl;AGel#`ri9KN|@3)drOxzeox7duuhq8`b=kc_ar*0
zotMq#>5)WIsJ-;v#`(gFW;v;h)`i`g@@qn(owBZZ_&}mhTO38V9?&_<vLI9nt+&3|
zLy9eYe>CL<oCQ=7_%-1Rwho$C(i{Xf`5y|I^AD(}%ADYu&Me~HYeG5KJkP_<);Ndf
zY-uRzpo`E6&v?*W8g1aDEsR(XstBC1mrVlPJS_?@oBK54+v|@wZ&fWu9YH&}N`(x3
zm1@ipw9^&a1e4dokLmJ^qow?lM$-1u2%E3ce+7$!30$oX*bDDSbh3^{f?jlQ&{N8m
zar+1Q1)^l@`U3NF-2eas?ny*JRCt{2-2rx^AP@#%feXmv0@hqWq!;LWx&N6KjNQo4
zN?1^5+yCqKZA^(y2qroK>^cAd_=$x7iRk{&?a47Hc|<lKy}S5=%?9Lnb3s{%bwswr
zfAcBHM|ew!N5&K}*(UKUAf20+m)QS*Xi!`E0H36rhvmk2Vt^&&ZCG#JPHcn)<h;fu
zN2WFC?9v4NzRWg2v+l)A1H3uyV>|b4ridIL0nSY0^Lzu8avXL_i2Pgswe-P91GR+K
z<sbKF62>tPP+Q&scG~i8gPpKfM*si-e*n-B%?~R7(~|B)e0Y~TC9>9-C?FjzCd-0k
z1a*|}%ToRfBVJ+Va9Q~?dpm9KaZ_A^Ec-3E=+9b{2kdhbSz)FIt>2n6`(?-$-2QT7
zq4rc!fG4x&@ynL7#+sr=bheNHyE=w_2RCwn%PH>p$M-w$+>g57Kdz2p7XqyHe}2F7
zZiEQ1metI^=Lp}Zvknjd0RDHTQ_&~Q7au#Po-`!=6D`TES=s}D=If4@96HcDTzrSn
zB(spO&#1%!2LfvPe#v_qax2*8aK-sYDmI(z62tShJU_shbutbBAk{NJ>lDnp|8;tN
z<6VW^Qy=_mkbN6GdPold008`Sf6NXhlKfz*<@n%#$bME=SbmFj0anXD!;1st-pz%7
zfB*o*#Qb{=Iv9W*JHGL*LR&Z*;dJb4kbN6W2B-i4000zWmLGgUb$&4JJ(nwNO;kiw
z_vp(H$Sw&`88yZI>H6C2RK9y&iAg<vKZX8=m3<D|4rv!*{PHHC<tC>Le_xnTNo-F_
z>f2yjO88fF+h}@T6}Utg?<3p-Y~82<00000003I*Nh%^Y{+O13p+8^|f1<DBeBBgJ
z_dF%}!nl0$ghaMCT>PAK`ADb8fL%IhOU2o-IJ5Ev8WCL|owdHfAhDthYKjK5|7WPj
zKFi-@P!<3H00000z^_Hqe{rYJcSx^aLL}E4N#{GH56O=&DVaYoy?zPd=mdeK^Bq<O
zSbqJIL}tFjO1OSWEoFOQ4t<Skx#iym>-r4X2gvOu1^@s6004mBgkGPRE+2ih3poZm
z1^Pbje@B-E?XLIA)iR<L?uU1C!A^*De(Yqv>|_S=h5^b)cuR=6f0e$j;m}I?H$FGF
zTWdqU2Ir*>Hm$*i<U9_`jd5IRaN8VM^s$ppFBRx_l@MU`j=`drqMWQ*+n@}~n*skk
zE&w4Xu?9FT0Y2;Sf{P7(MGl>Q1lX+se!j3=x_Qb`hiSh2zWlt8*_8{z=bT*k<rSCO
z`xd&E0{{R309-0MG9?sUe2h+)FObR4CHcB+KCdxmXN3R&00000O#A`ITT!t8IPFOQ
O0000<MNUMnLSTaXu#SWP

diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json
new file mode 100644
index 00000000000..9e7776e7813
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json
@@ -0,0 +1,10 @@
+{
+	"thinchoker": [
+		{
+			"type": "icon_state",
+			"icon_state": "thinchoker_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json
new file mode 100644
index 00000000000..ef774087496
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json
@@ -0,0 +1,10 @@
+{
+	"thinchoker": [
+		{
+			"type": "icon_state",
+			"icon_state": "thinchoker_mob",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
index e18fdf60427..21d514c2bc7 100644
--- a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
@@ -52,6 +52,14 @@
 	greyscale_config_worn = /datum/greyscale_config/collar/choker/worn
 	greyscale_colors = "#222222"
 
+/obj/item/clothing/neck/human_petcollar/thinchoker
+	name = "thin choker"
+	desc = "Like the normal one, but thinner!"
+	icon_state = "thinchoker"
+	greyscale_config = /datum/greyscale_config/collar/thinchoker
+	greyscale_config_worn = /datum/greyscale_config/collar/thinchoker/worn
+	greyscale_colors = "#222222"
+
 /obj/item/key/collar
 	name = "collar key"
 	desc = "A key for a tiny lock on a collar or bag."
diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm
index bff0df5dec9..9af8adabbbe 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm
@@ -127,6 +127,10 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck)
 	name = "Choker"
 	item_path = /obj/item/clothing/neck/human_petcollar/choker
 
+/datum/loadout_item/neck/thinchoker
+	name = "Thin Choker"
+	item_path = /obj/item/clothing/neck/human_petcollar/thinchoker
+
 /datum/loadout_item/neck/collar
 	name = "Collar"
 	item_path = /obj/item/clothing/neck/human_petcollar
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm
index 0a44b8e3b6c..59241ed4dc1 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm
@@ -58,6 +58,7 @@
 					/obj/item/clothing/neck/kink_collar = 8,
 					/obj/item/clothing/neck/human_petcollar = 8,
 					/obj/item/clothing/neck/human_petcollar/choker = 8,
+					/obj/item/clothing/neck/human_petcollar/thinchoker = 8,
 					/obj/item/clothing/neck/human_petcollar/locked/cow = 8,
 					/obj/item/clothing/neck/human_petcollar/locked/bell = 8,
 					/obj/item/clothing/neck/human_petcollar/locked/cross = 8,