From 46f58058dc5b46d66db3ff663efc347cdec0a579 Mon Sep 17 00:00:00 2001
From: Shroopy <46693163+Shroopy@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:00:19 -0700
Subject: [PATCH] Adds a GPS tracking collar (#1726)

## About The Pull Request
Adds a GPS tracking collar to the game. It can be found in the LustWish
premium section. The collar broadcasts a GPS signal with the name of the
collar. Tracking can be toggled on and off with alt-right-click. The
tracking collar can be locked, not only preventing removal but also
preventing toggling the tracking. The collar cannot receive GPS signals,
only send one.

## Why It's Good For The Game
Requested by Aeri on the Discord. Pre-approved by @projectkepler-ru.

## Proof Of Testing
https://youtu.be/iFcZotyVUuQ

## Changelog

:cl:
add: Added a GPS tracking collar to the LustWish
/:cl:

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
---
 code/__DEFINES/~~bubber_defines/signals.dm    |   2 +
 code/modules/loadout/loadout_items.dm         |   1 +
 .../modules/GAGS/json_configs/collar/gps.json |  22 ++++++
 .../json_configs/collar/gps_lefthand.json     |  16 +++++
 .../json_configs/collar/gps_righthand.json    |  16 +++++
 .../GAGS/json_configs/collar/gps_worn.json    |  16 +++++
 .../code/modules/GAGS/greyscale_configs.dm    |  19 +++++
 .../code/modules/GAGS/icons/collar.dmi        | Bin 929 -> 3425 bytes
 .../code/modules/clothing/neck/collars.dm     |  68 ++++++++++++++++++
 .../code/modules/loadout/categories/neck.dm   |   4 ++
 .../code/modules/vending/armadyne.dm          |   4 ++
 .../code/modules/vending/lustwish.dm          |  13 ++--
 tgstation.dme                                 |   1 +
 13 files changed, 176 insertions(+), 6 deletions(-)
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/gps.json
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json
 create mode 100644 modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json
 create mode 100644 modular_zubbers/code/modules/vending/armadyne.dm

diff --git a/code/__DEFINES/~~bubber_defines/signals.dm b/code/__DEFINES/~~bubber_defines/signals.dm
index 10e6cf57438..023ececaf43 100644
--- a/code/__DEFINES/~~bubber_defines/signals.dm
+++ b/code/__DEFINES/~~bubber_defines/signals.dm
@@ -1,2 +1,4 @@
 // Signal sent when the morgue tray throws its alarm
 #define COMSIG_MORGUE_ALARM "morgue_alarm"
+// Can be sent whenever an object's name is changed so components can be properly updated as well
+#define COMSIG_NAME_CHANGED "name_changed"
diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm
index b4a51206392..79c8012814a 100644
--- a/code/modules/loadout/loadout_items.dm
+++ b/code/modules/loadout/loadout_items.dm
@@ -297,6 +297,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
 			renamed = 1
 		if(renamed)
 			ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout")
+			SEND_SIGNAL(equipped_item, COMSIG_NAME_CHANGED) // BUBBER EDIT
 	// SKYRAT EDIT END
 
 	if(can_be_reskinned && item_details?[INFO_RESKIN])
diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps.json
new file mode 100644
index 00000000000..e112f2bc0b2
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps.json
@@ -0,0 +1,22 @@
+{
+	"gps": [
+
+		{
+			"type": "icon_state",
+			"icon_state": "collar_band_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_tracker_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_screen",
+			"blend_mode": "overlay"
+		}
+	]
+}
diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json
new file mode 100644
index 00000000000..4486fb697fc
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json
@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_tracker_l_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_band_l_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json
new file mode 100644
index 00000000000..14b4568ba2d
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json
@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_tracker_r_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_band_r_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json
new file mode 100644
index 00000000000..4216f213c09
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json
@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_mob_tracker_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_mob_band_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm
index b137fde1353..1a123b44660 100644
--- a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm
+++ b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm
@@ -11,6 +11,24 @@
 	name = "Ring Bell Collar (Worn)"
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/ringbell_worn.json'
 
+
+/datum/greyscale_config/collar/gps
+	name = "GPS Collar"
+	icon_file = 'modular_zubbers/code/modules/GAGS/icons/collar.dmi'
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps.json'
+
+/datum/greyscale_config/collar/gps/worn
+	name = "GPS Collar (Worn)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json'
+
+/datum/greyscale_config/collar/gps/lefthand
+	name = "GPS Collar (Left hand)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json'
+
+/datum/greyscale_config/collar/gps/righthand
+	name = "GPS Collar (Right hand)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json'
+
 //Bunny stuff, sprites from MonkieStation
 
 /datum/greyscale_config/bunnysuit
@@ -62,3 +80,4 @@
 	name = "Worn Playbunny Ears"
 	icon_file = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi'
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json'
+
diff --git a/modular_zubbers/code/modules/GAGS/icons/collar.dmi b/modular_zubbers/code/modules/GAGS/icons/collar.dmi
index d3c65c9f6ef9262d7a2a17c34d380619d99bb294..0aec642890773622cad2cac64fb14dbba31d3704 100644
GIT binary patch
literal 3425
zcmb_fdpr~D9(Rkqy-K3=Qq5&96-xDzOB)$8a(T6yluIJFnwaa@NJVnLwWzFKMJ~D1
zEJk^eOUP|Zxh-bKB-Yq$JL~f~=Z|wf=X5@w^ErP!&-2G~{e8dR=llGgBqs;hj_u0Z
z#l*yRz-^$;qIUX60Z5B#WxaqIQL~OgxP(G|&{sqJZ-)8@p~S=@A3w=_i+Xo#7qtI7
zvV7Y0{4XCy@P}V^i{swb(AvX;ulv*DH+Tn~{ix11#PPwVyz$SPO%+r5dc%(rfEgHq
zI^bo&uYGBg-ZB#I7akk0kIu~u`R2+?=~5Nr)$`VQ@h4~{GUA%Prp^a;t|aHg)G1qL
zTpW)w$FIL8=1+sSjbZPoCUPSlNd>u)D_n!G9eb$&&`B<?*{IFe_s@gZM}szdit}mc
z?^VwoB7TiEz}nplE_E&QyEdK<<8|?C*W@EKmkhrYp8F{KsflRt+d;Md6JW*YM!tRI
zFU%V|*hMphjuxfTw%)oVF)>*kIMf0W`FQ!Wo8Kk+fzDOJ{5$E%hnZngf3COJ(z=pX
zNIM$tQ&Vc<FX5}_1D5Tt-2KDa!xQa!JFI!k4_#ZK(ssuJRpb8q3t}qFPJej1p{g#T
zL1X`Kzu&k&sw3}pk|;autJL*}PdlbIZ5;v=;95_uCihjBR~D?P6SN<ExVEjegHnzZ
zJM|v0>lidHPEA5eR$kTfo|w3$6kwmadFw85mZetqX3dCDrhcbj;we6L`Y%$HW-psb
zaVz#PH8D}1=-+N-B^nYE9c^l8Y|I!P9o@O4kQWP4Om4p=AfGGAQAyyDed1Ez+S}WQ
z#k6h4;3&ex(>D9f&}cO4NyH?B5!~z>hl~6yMM(pK)V%gRcP^n$5BDs@UaECm+T%fc
zIciJeIEp5-`Q{Jp9UTJ$1MP-}h7Rvd=8>NiiH}b7FXZ;qC4pAAs=gYXj!tq62v!_U
z*C+G`hK8OTT`npVo@T$6^n5KE8gx7yy<S@&#BRnEWbPWX?6G%(<ac$!Iir_?!Vai?
z6n_;~C#M6KGy57hF*!L8(AxF1fftwcCDF*(xRI_i)+IQ=i)(%LeZM$gQeTjH7M}n3
z@e;R#SxDOg-YiS=xIemN-n+2ix5Q;L`(mdy8Yhv}#==~HMU%RC)xb!gMVmJY#d@GE
zr4Aj2e!E*9-A-AgnY)C=D4x{a2?Q_MzHsj84?>}i?^fTfZX|(1p*qa^v*}S(Dz&tE
z6Q}`(!oNu5kg1e6oXP0(!UC*0)E*?6gGx=^*kzS@di!?S+warjT92vzU``_8Kawhu
zpw8jM5ogx(<Sq$TS2g4&+meSg;>0xOx8~D$#HtdsFOrHa$p#oKC0tVo&A=B{5!c)M
z`qE5W8flXs$VHC&b09dymXc3~M1)%rE_c@-ICLe@PvR4ms%*1Q#4IW>uxu)Md@dL1
z9?aavpuH;sF>Z4v@u1Xbn*EgH{`?Cwvk$<HIYUGJVAvgO$a-Nhh7^=2+6;risK(|n
zJ*2BC7lTczYinsB26IYK0oK1hYE53@FC=2-yI>Q7@}qn{q2gw+okC(!1a^zzOF+kN
zuB~0qm!2MZ<H2I!_UDVqY$~nZb{Q2NJbLD?QXP?~!|0f05s!Qx0e?Q>2v#=5&RfzG
zk0gCO=KUkiF|*abf<SOQm{<B5CHHcJ7kf9^$S@BWy@Yhg+Q)x))z7;1$_Z9#**6cy
zr}13s+g#Yers8GJ6Y$!zH|W`_AIO-pY?+_N_t@{x*CJ<lNy#39m@uqUXp_VO+;?Mo
zVjX_%ktwS$sjdF@?^!2<{Yc>h^TQ=A@*eMxNhAy_5tP^rx)ql8sD%2_9$vqzGPi<}
z+#j?bVDi2ATo%IA3Ek<&pkC8ny{jUg;4-fbIrjrby>h$3ihZ5U!Cfkp`oVhYJ$ewz
zRsg_goSFUgsG)_%^!KETa3fgzJIwM2;5I(8{ZoXntsWgqGopdWH#J%_Fl_cvb^U9P
z310Tm&lT0c;y_{ZiXc(5B)s6Oh_#i#7#IZ8&7Yl{%6rncu{qHa0gJ^3=r|Nt{i5tu
zNyeFIVZ*qsMh)Ne;HArwT#cu((?wH-1uZd0gwfF?zLJ#`vLo$bAq4A<Ou;?BrzNtP
zYPr7~%ui+d69of~&FUVNyEiHCiN`$2Fz^#bE~a1Jb0aPu_l{QT7pG?ZU+=)r7XMFn
zD3O4wb-(q}7PMRciNgxlMIT?r=Pizu^^V6i0IKZr&UU~DtFLyt;y%;TAuP}tXyEnu
zaGmTfB2<0m0Ulr9)T9e1-JCfy#L;#vKo~wcub#QkbKSPfdvG&I&{;YX;Ngo}<SYZB
zy=lX@&T7#nW7h29gL6IjdJ?HLFE8)G)CmKFXCou$^>lUp!otqm+1cGny~9?^>G6SQ
z(W7KA&+WCcS>3ruBpc=O^~w;3M{q}<2*76zEo7p6*@v^cPQ^~K{z_7Cb#WQ!?M>OM
zq;#o5s1npPv$e5z?_LSF;*iGjNHh0jxxtQ(gxOW1%5T3hn6y&YSESU`9Z?0^{t=<h
z9LGD7Q&OURDqM7TVybzwLE!ndDEOdgy=%U{SC?nApSQQSyF7Cm=<c?iX3j;qU-$L~
z%}2Q}>wUco9Z)UE*z(D-)ueY)dRCtK$MMG|IW#7x7UASjU{-QjzgR)rVd2|c&kb0!
z^-=Q1pCOHpFCdY;`ujwGCr2o|dRujG5igEy$`RZfu{(tu_#-K(Wot;Gr>7^MK%fi`
zW{CnhX=-XZ3^Dp%%m8~<yC4qdW<94y!+FYYciP4X4&CRj-TEu>LcX+!zCcr6m^fD$
z-tJXhsBu$9jm-U8GhRMVr=QnR1SM?@IQQH>Cg>B0&@ePKM8tjt<=QgdXKLK<q}jJX
z7FRdv0xH%`AAe3CKQuV#ynIz?vIgei{K^Uop9%m-ef(VKg3S2R`*XvzGK&5gNE59y
zz065R=h25n)=J7Y3`?%9#6PZp-mcsqyy2P}GZHYuHYL-AUy+<IM`I^ANT2doqDM*4
znGVE*d}=Sc5pP=5*47%#T57u%+~a6mPkFU!=1x15j7!H5_`Wyk@}^OG#SjU7J-v1j
z89cJXzJqQpiZ?3%$W(aSDhTB}pY)Q9Z}YGe``PR8lbb=>InW|~tr#em&;CZCP%KTY
zkPj(4qM3_XicBU`Khx%i*ttg%M*3BUgBmZh9?ZQM@}CPaepOld2Im2Yz~S5(p`>s%
zcjhmrn7)hlpxq=4yL4{xshyig&Y?^jV)Mb!58#7!wl8Ljii!}B)1e}8!34_K*qFK3
zSl|JZ<~vuM7GYZ!!YzP<xAsDLi%Z3b4x$9{$x`mL_wn6ajj5+?uqt&G&xeS^dyE!7
zc6#Lj4#F%XJ>?}<cgXxpf>W2<<$W39?o&%9v!vOjFCDakZX}9*%o3_5cOxbQ7-@M}
zq3w$rrr{7Hw7*BqyiTz_n=eX0s=3HR+k6574u757r8@AeV=R83Pn4#ttMYJQ%<a*1
zHmmc-afv@)=yYhaeVci~kN%NO{m*9i@BPRLDgOOxcQJ0EbAPbNdicDp21Y-yg9k}r
zDrz2(d1wQ=3?{75Nm5!1#<N=!n{PSVALiiz8lNEQp`}=)q8Fakr%9eI9#U3ON$!On
zu;`OlN-+NRE>gG>)^f7%S>ouJ4AfEi^>MC&L6J!MFKklEKUes6u1Q`vyho|QcRD;i
zzh6%l{l#idu+oXmJ*(wb?K1rSz0E?bAfSHHxg@9Ja^v7f(s2vzGnFC}32D^rUpoWz
zEJ1{<MmEv3lP9>%XUr?Dt*yNZ=oc%kVI*vpC-C0{J9|=UXWiyz)X>}siT?|TI?mz`
zY&DhcM$K~T(?%iD2$oQXVbbbc@<n9A%QrGwG9t|?BF#_&^Xu9N(~snxl_sT$T)LgM
zsv1-ic;$^y514Gh;F6xMMqVyK*s7?g@LdQE-E%cvA#Y|XX(9+bUtiSS8-`A6YDJ+T
z@4|&VCi=^JdD`#e1g!nQMd4Y6yKn`ACJa{B)#G7=2eL!U<c`%aFgeo%AStWzPdep7
YGFn*%{6ArnqCb-u+{yu3amF+LZ=SAjk^lez

literal 929
zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdss5^vh!U67;^d;tf|AVqJO+k}
zIl*BCMWx@r1Q&e#`b5iHSL@uF^T8WJ4K5l#c%*aQNAqL=kYo1f(HW1kKIb(W3%b08
zyn{q@M5j#pTwEm7{pj=LO;dJQ1RHgC0R?$>T3qfDDh^i6*>P#nnLS^YT$wZH$D|`A
zmrR~KQ&$w3Es$s>$9sxvU7a46-oAM;4Cmb3f67jO&&|NVbk@_wF{EP7+q)b4Ryjzt
zJ)A%Ja$s-(|H2PqDhJPHZ<~B1d%+Bz@C4u2Ii}Ay=xpdwGN`*hIj85{p-E?68@yWQ
zcKvlI$MyMZ`5U$!WjJ8SP{6|=!_06T&a7|>6zO02I$O5+cU7wW#Pi0Dxwmiaw3j|!
z_~i^^>mrRV_sb>|gHGMc+n(^=V>06xcAL|iZd#iitJ(eUrDMyh_ZNEe9@Mh!S-*d+
z;ju1*mc5cZ4k;BMet&<Z`S<N+ozJ)CT{Dz&m@aKGzk2=d<NJ-eFZ}M+i@UQxI$5Rf
z@rm+RWw%SdJO4J8awtFbE%I;q&bK{=b2!VgK8ZYF^VLk%pWa>0BJ<_%?5%79f|m2o
zZ_AWg_rU(l`fLV4LGuq@D-T8{oclR9yP;NU4&$As^J|~Dx=abWXZ@bfO8)=*%Wsx9
z9T#gVlyT3!9aVnw|Gn4k7VC7pqeDZV=-vOh+ivRhY{u%KX;1qVBpdfD#2=B6`m^$O
z=AAe0jMaq}GH?FY&HqyudwmXP8do0Miq}?NlUydL2(JCQU%y<M{l0$zW5*x+>+=2X
zFXM`MALyT8aH-=nWB+e?(2i?CDvLGq1tSRt3pR#6#)f2u2iTc$d<%fVJ8RkM|C(X5
zmX&pzr~NRgvHZb0|HJhYHmo+9zQL=vPSZ`>uWHz!{<QMnTcZ#g)`rJCc+Et&NpHt@
z&X`*-OK$xVFgq%V8ujp0a3_gz&Cf#JKN&Ng>WDR5tD4%VdHPb;+WUXA6LiEJ<~?6s
zli?g18u;S>q`m6htQ($Lr?&iCCsTdMRe^vH(OvV7`_|Ok(N7(3#RBsjgQu&X%Q~lo
FCIEMok!An@

diff --git a/modular_zubbers/code/modules/clothing/neck/collars.dm b/modular_zubbers/code/modules/clothing/neck/collars.dm
index edc4614407d..bba571915b5 100644
--- a/modular_zubbers/code/modules/clothing/neck/collars.dm
+++ b/modular_zubbers/code/modules/clothing/neck/collars.dm
@@ -9,3 +9,71 @@
 /obj/item/clothing/neck/human_petcollar/locked/ringbell/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/squeak, list('modular_zubbers/sound/misc/collarbell1.ogg'=1,'modular_zubbers/sound/misc/collarbell2.ogg'=1), 50, 100, 8)
+
+/obj/item/clothing/neck/kink_collar/locked/gps
+	name = "tracking collar"
+	desc = "A collar that lets you find your pet anywhere with GPS!"
+	var/datum/component/gps/gps
+	icon_state = "gps"
+	greyscale_config = /datum/greyscale_config/collar/gps
+	greyscale_config_worn = /datum/greyscale_config/collar/gps/worn
+	greyscale_config_inhand_left = /datum/greyscale_config/collar/gps/lefthand
+	greyscale_config_inhand_right = /datum/greyscale_config/collar/gps/righthand
+	greyscale_colors = "#8B96B7#505665"
+	flags_1 = IS_PLAYER_COLORABLE_1
+	unique_reskin = null
+	resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/neck/kink_collar/locked/gps/Initialize(mapload)
+	. = ..()
+	atom_storage.click_alt_open = FALSE
+	gps = AddComponent(/datum/component/gps, name)
+	register_context()
+	update_icon(UPDATE_OVERLAYS)
+	RegisterSignal(src, COMSIG_NAME_CHANGED, PROC_REF(on_update_name))
+
+/obj/item/clothing/neck/kink_collar/locked/gps/proc/on_update_name()
+	SIGNAL_HANDLER
+	gps.gpstag = name
+
+/obj/item/clothing/neck/kink_collar/locked/gps/attack_self(mob/user)
+	. = ..()
+	gps.gpstag = tagname
+
+/obj/item/clothing/neck/kink_collar/locked/gps/examine(mob/user)
+	. = ..()
+	. += span_notice("Alt-click to [gps.tracking ? "disable":"enable"] tracking.")
+
+///Calls toggletracking
+/obj/item/clothing/neck/kink_collar/locked/gps/click_alt(mob/user)
+	if(locked)
+		balloon_alert(user, "it's locked!")
+		playsound(src, 'sound/items/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+	else
+		toggletracking(user)
+		balloon_alert(user, "tracking [gps.tracking ? "enabled":"disabled"]")
+		playsound(src, 'sound/machines/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+	return CLICK_ACTION_SUCCESS
+
+/obj/item/clothing/neck/kink_collar/locked/gps/proc/toggletracking(mob/user)
+	gps.tracking = !gps.tracking
+	update_icon(UPDATE_OVERLAYS)
+	user.update_worn_neck()
+
+/obj/item/clothing/neck/kink_collar/locked/gps/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(!locked)
+		context[SCREENTIP_CONTEXT_ALT_LMB] = "[gps.tracking ? "Disable":"Enable"] tracking"
+		return CONTEXTUAL_SCREENTIP_SET
+
+/obj/item/clothing/neck/kink_collar/locked/gps/update_overlays()
+	. = ..()
+	if(gps.tracking)
+		. += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light")
+		. += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light", src, alpha = src.alpha)
+
+/obj/item/clothing/neck/kink_collar/locked/gps/worn_overlays(mutable_appearance/standing, isinhands = FALSE)
+	. = ..()
+	if(gps.tracking && !isinhands)
+		. += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light")
+		. += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light", src, alpha = src.alpha)
diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm
index 2fa90fad540..1fa456e2d98 100644
--- a/modular_zubbers/code/modules/loadout/categories/neck.dm
+++ b/modular_zubbers/code/modules/loadout/categories/neck.dm
@@ -7,6 +7,10 @@
 	name = "Ringing Bell Collar"
 	item_path = /obj/item/clothing/neck/human_petcollar/locked/ringbell
 
+/datum/loadout_item/neck/gps
+	name = "Tracking Collar"
+	item_path = /obj/item/clothing/neck/kink_collar/locked/gps
+
 /datum/loadout_item/neck/binary
 	name = "Crow Feather Cloak"
 	item_path = /obj/item/clothing/neck/binary
diff --git a/modular_zubbers/code/modules/vending/armadyne.dm b/modular_zubbers/code/modules/vending/armadyne.dm
new file mode 100644
index 00000000000..4f5c8fcb681
--- /dev/null
+++ b/modular_zubbers/code/modules/vending/armadyne.dm
@@ -0,0 +1,4 @@
+/obj/machinery/vending/security
+	zubbers_contraband = list(
+		/obj/item/clothing/neck/kink_collar/locked/gps = 3,
+	)
diff --git a/modular_zubbers/code/modules/vending/lustwish.dm b/modular_zubbers/code/modules/vending/lustwish.dm
index 2678f9f644f..4cae04f1aef 100644
--- a/modular_zubbers/code/modules/vending/lustwish.dm
+++ b/modular_zubbers/code/modules/vending/lustwish.dm
@@ -23,10 +23,11 @@
 	)
 
 	zubbers_premium = list(
-	/obj/item/holosign_creator/sex = 6,
-	/obj/item/clothing/under/mikubikini = 3,
-	/obj/item/clothing/suit/mikujacket = 3,
-	/obj/item/clothing/head/mikuhair = 3,
-	/obj/item/clothing/gloves/mikugloves = 3,
-	/obj/item/clothing/shoes/sneakers/mikuleggings = 3,
+		/obj/item/clothing/neck/kink_collar/locked/gps = 3,
+		/obj/item/holosign_creator/sex = 6,
+		/obj/item/clothing/under/mikubikini = 3,
+		/obj/item/clothing/suit/mikujacket = 3,
+		/obj/item/clothing/head/mikuhair = 3,
+		/obj/item/clothing/gloves/mikugloves = 3,
+		/obj/item/clothing/shoes/sneakers/mikuleggings = 3,
 	)
diff --git a/tgstation.dme b/tgstation.dme
index 9af4ec15383..e5de2fd98e4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9052,6 +9052,7 @@
 #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
+#include "modular_zubbers\code\modules\vending\armadyne.dm"
 #include "modular_zubbers\code\modules\vending\clothmate.dm"
 #include "modular_zubbers\code\modules\vending\comdrobe.dm"
 #include "modular_zubbers\code\modules\vending\games.dm"