From c94079b0a54262c66007812c5613bcda388a9757 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Mon, 8 Feb 2021 20:14:58 +0100
Subject: [PATCH 1/6] New Dominian dresses and red cape update. (#11137)

---
 .../loadout/loadout_uniform.dm                |  25 +++-
 code/modules/clothing/clothing.dm             |   1 -
 code/modules/clothing/factions/dominia.dm     | 112 ++++++++++++++++++
 .../clothing/under/accessories/accessory.dm   |   8 +-
 .../mattatlas-thiswasmoreworkthanbrainmed.yml |  43 +++++++
 .../suits/capes/dominia_doublecape.dmi        | Bin 726 -> 933 bytes
 icons/clothing/suits/capes/dominia_red.dmi    | Bin 712 -> 1131 bytes
 .../under/uniforms/dominia_dresses.dmi        | Bin 0 -> 6765 bytes
 8 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml
 create mode 100644 icons/clothing/under/uniforms/dominia_dresses.dmi

diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 593db51462b..0939c399d2d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -199,7 +199,7 @@
 
 /datum/gear/uniform/colorpants/New()
 	..()
-	var/colorpants = list()
+	var/list/colorpants = list()
 	colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
 	colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
 	gear_tweaks += new/datum/gear_tweak/path(colorpants)
@@ -209,14 +209,14 @@
 	path = /obj/item/clothing/under/syndicate/tacticool
 
 /datum/gear/uniform/dominia
-	display_name = "dominia clothing selection"
-	description = "A selection of dominian clothing."
+	display_name = "dominian clothing selection"
+	description = "A selection of Dominian clothing."
 	path = /obj/item/clothing/under/dominia
 	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/uniform/dominia/New()
 	..()
-	var/suit = list()
+	var/list/suit = list()
 	suit["dominia suit, red"] = /obj/item/clothing/under/dominia
 	suit["dominia suit, black"] = /obj/item/clothing/under/dominia/black
 	suit["dominia sweater"] = /obj/item/clothing/under/dominia/sweater
@@ -226,6 +226,19 @@
 	suit["dominia summer dress"] = /obj/item/clothing/under/dominia/dress/summer
 	gear_tweaks += new/datum/gear_tweak/path(suit)
 
+/datum/gear/uniform/dominia_dress
+	display_name = "dominian dress selection"
+	description = "A selection of fancy Dominian dresses."
+	path = /obj/item/clothing/under/dominia/dress
+
+/datum/gear/uniform/dominia_dress/New()
+	..()
+	var/list/suit = list()
+	for(var/dress in subtypesof(/obj/item/clothing/under/dominia/dress/fancy))
+		var/obj/item/clothing/under/dominia/dress/D = new dress //I'm not typing all this shit manually. Jesus christ.
+		suit["[D.name]"] = D.type
+	gear_tweaks += new/datum/gear_tweak/path(suit)
+
 /datum/gear/uniform/elyra_holo
 	display_name = "elyran holographic suit selection"
 	description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Perispolisean clothes respectively."
@@ -234,7 +247,7 @@
 
 /datum/gear/uniform/elyra_holo/New()
 	..()
-	var/suit = list()
+	var/list/suit = list()
 	suit["elyran holographic suit, feminine"] = /obj/item/clothing/under/elyra_holo
 	suit["elyran holographic suit, masculine"] = /obj/item/clothing/under/elyra_holo/masc
 	gear_tweaks += new/datum/gear_tweak/path(suit)
@@ -252,7 +265,7 @@
 
 /datum/gear/uniform/officer/New()
 	..()
-	var/uniform = list()
+	var/list/uniform = list()
 	uniform["officer uniform, standard"] = /obj/item/clothing/under/rank/security
 	uniform["officer uniform, corporate"] = /obj/item/clothing/under/rank/security/corp
 	uniform["officer uniform, blue"] = /obj/item/clothing/under/rank/security/blue
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index cace2eebb53..14425365548 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -936,7 +936,6 @@
 		var/mob/M = src.loc
 		M.update_inv_w_uniform()
 
-
 /obj/item/clothing/under/examine(mob/user)
 	..(user)
 	switch(src.sensor_mode)
diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm
index efe79644a14..9802762074c 100644
--- a/code/modules/clothing/factions/dominia.dm
+++ b/code/modules/clothing/factions/dominia.dm
@@ -325,6 +325,37 @@
 	overlay_state = "dominian_cape_red"
 	contained_sprite = TRUE
 	icon_override = null
+	var/rolled = FALSE
+
+/obj/item/clothing/accessory/poncho/dominia/red/update_clothing_icon()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_wear_suit()
+	get_mob_overlay(TRUE)
+	get_inv_overlay(TRUE)
+
+/obj/item/clothing/accessory/poncho/dominia/red/verb/roll_up_mantle()
+	set name = "Roll Up Cape Mantle"
+	set desc = "Roll up your cape's mantle. Doesn't work with some capes."
+	set src in usr
+
+	if(use_check_and_message(usr))
+		return FALSE
+
+	var/list/icon_states = icon_states(icon)
+	var/initial_state = initial(icon_state)
+	var/new_state = "[initial_state]_h"
+	if(!(new_state in icon_states))
+		to_chat(usr, SPAN_WARNING("Your cape doesn't allow this!"))
+		return
+
+	rolled = !rolled
+	to_chat(usr, SPAN_NOTICE("You roll your cape's mantle [rolled ? "up" : "down"]."))
+	icon_state = rolled ? new_state : initial_state
+	item_state = rolled ? new_state : initial_state
+	overlay_state = rolled ? new_state : initial_state
+	update_icon()
+	update_clothing_icon()
 
 /obj/item/clothing/under/dominia/initiate
 	name = "tribunal initiate's robe"
@@ -383,3 +414,84 @@
 	desc = "A warm fur hat with ear flaps that can be raised and tied to be out of the way. This one has a large Fisanduhian flag on the front."
 	icon_state = "fishushanka"
 	item_state = "fishushanka"
+
+/obj/item/clothing/under/dominia/dress/fancy
+	name = "Morozi dress"
+	desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has sleeves."
+	desc_fluff = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
+				the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \
+				due to the often frigid temperatures of Moroz."
+	icon = 'icons/clothing/under/uniforms/dominia_dresses.dmi'
+	icon_state = "morozi_dress"
+	item_state = "morozi_dress"
+	contained_sprite = TRUE
+	var/house
+
+/obj/item/clothing/under/dominia/dress/fancy/Initialize()
+	. = ..()
+	if(house)
+		desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has sleeves, and a colored sash marking its wearer as \
+				an affiliate of House [capitalize(house)]."
+		icon_state = "[house]"
+		item_state = "[house]"
+		update_clothing_icon()
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless
+	name = "sleeveless Morozi dress"
+	desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has no sleeves."
+	desc_fluff = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
+				the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \
+				due to the often frigid temperatures of Moroz."
+	icon_state = "morozi_dress_rs"
+	item_state = "morozi_dress_rs"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/Initialize()
+	. = ..()
+	if(house)
+		desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has no sleeves, and a colored sash marking its wearer as \
+				an affiliate of House [house]."
+		icon_state += "_rs"
+		item_state += "_rs"
+		update_clothing_icon()
+
+/obj/item/clothing/under/dominia/dress/fancy/zhao
+	name = "house zhao Morozi dress"
+	house = "zhao"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/zhao
+	name = "sleeveless house zhao Morozi dress"
+	house = "zhao"
+
+/obj/item/clothing/under/dominia/dress/fancy/volvalaad
+	name = "house volvalaad Morozi dress"
+	house = "volvalaad"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/volvalaad
+	name = "sleeveless house volvalaad Morozi dress"
+	house = "volvalaad"
+
+/obj/item/clothing/under/dominia/dress/fancy/strelitz
+	name = "house strelitz Morozi dress"
+	house = "strelitz"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/strelitz
+	name = "sleeveless house strelitz Morozi dress"
+	house = "strelitz"
+
+/obj/item/clothing/under/dominia/dress/fancy/caladius
+	name = "house caladius Morozi dress"
+	house = "caladius"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/caladius
+	name = "sleeveless house caladius Morozi dress"
+	house = "caladius"
+
+/obj/item/clothing/under/dominia/dress/fancy/kazhkz
+	name = "house kazhkz Morozi dress"
+	house = "kazhkz"
+
+/obj/item/clothing/under/dominia/dress/fancy/sleeveless/kazhkz
+	name = "sleeveless house kazhkz Morozi dress"
+	house = "kazhkz"
+
+
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index bad23d7a30c..7042602aaee 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -28,11 +28,11 @@
 		cut_overlays()
 		add_overlay(overlay_image(icon, worn_overlay, flags=RESET_COLOR)) //add the overlay w/o coloration of the original sprite
 
-/obj/item/clothing/accessory/proc/get_inv_overlay()
+/obj/item/clothing/accessory/proc/get_inv_overlay(var/force = FALSE)
 	if(!mob_overlay)
 		get_mob_overlay()
 	var/I = mob_overlay.icon
-	if(!inv_overlay)
+	if(!inv_overlay || force)
 		var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
 		if(icon_override)
 			if("[tmp_icon_state]_tie" in icon_states(icon_override))
@@ -47,9 +47,9 @@
 		inv_overlay.add_overlay(overlay_image(I, worn_overlay, flags=RESET_COLOR)) //add the overlay w/o coloration of the original sprite
 	return inv_overlay
 
-/obj/item/clothing/accessory/proc/get_mob_overlay()
+/obj/item/clothing/accessory/proc/get_mob_overlay(var/force = FALSE)
 	var/I = icon_override ? icon_override : contained_sprite ? icon : INV_ACCESSORIES_DEF_ICON
-	if(!mob_overlay)
+	if(!mob_overlay || force)
 		var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
 		if(icon_override)
 			if("[tmp_icon_state]_mob" in icon_states(I))
diff --git a/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml b/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml
new file mode 100644
index 00000000000..0a35157392a
--- /dev/null
+++ b/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas, DasFox
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added new fancy Dominian dresses under a new loadout selection."
+  - imageadd: "Updated the tribunal cape."
+  - rscadd: "Added a verb to the red tribunalist cape that allows you to hide part of it."
diff --git a/icons/clothing/suits/capes/dominia_doublecape.dmi b/icons/clothing/suits/capes/dominia_doublecape.dmi
index d4f7d78e30fea427c4a6b237763189ca7c6e8cb4..62aeff321ff22a681e65204a6ed743bedab059b6 100644
GIT binary patch
delta 752
zcmV<M0uTMx1*Hd&Bq||LOjJd{z`$b%3`hkCyF@aQeoI0U3zRe^(y?0G$YQ08Pj+WN
zL|LDykxQX}0-#AmK~z|U?U&7N(?Ar3rxxCH)p3MNS;dB?Qg`9fX}SbNC0MngegJ30
zBw>}*>Q7z(Wf_60uIZC9cGdCqo!FB~L}HO6d*OJ#Ik6Mnqr=!n>r)WNJI`6a^**`i
zJ_q1(nx)ucr#MQri=#A<yw`1|*pa=!j^3~QC>6qgjPGTl+><&+(>R(Ui`MN(icw}(
zP)9F#1-&3Bzra|DpCHC&1$B%>G@Ew1#$xMKfVL1H>KwnpAdV%RJza0h0)QVij(!Vf
zYMjAK;{ZYqrGlsTLLGg$l>npcs02XmhSC7kar=w-1aNxt6#-&5gwlaH`XG;QZa^N@
z164<V4P*cr0^}o*)@<Ml$a;_o19%~HuObjZ9UvihfbX>canwNm3<%(=dl`u|KpRZZ
z2EK;1g!vu3h^Kc^%Hw)KD1`t`>?M7(zHpo%M?X}G>$3!ycb6nF;(5A2j_jQCM4xA@
zPTEo1lsouIq1yGDSTGhh+}~)Ue<#oStHo`9d`0tuMf1z*`h$6Zu4rB`?>-z>cJ!{(
z8T!CVsKX%cR4fh#ar96c(1c?B7Q8#ez{4Bp?wczsq1d^E^fd<lgm_5MywLacIRA`+
z3q6L+4pu@j_Vzc-_A$`Ehm(&6pb4el>ToWuFp$XkwRx{JFLEHCrWnu<Wd@&>7b^gN
z)x6N^fDOO^0hRH;27u&+6QJY&5lAN($TOq~h?ET|bD!pgR>Bnp6gT7D%8P>FiweLw
ziUXP#1(8&NYJ6<+Vx#q`UF`?XyrBKSl^0e&aODN<2d=!Z`hhDitbX9i3#%VE^1|*1
zj=Zq@fg>;Me&87Yc0X_ev>!Nzv)vCnRsgE~zzNWPumV8(L33U#=?Beuv7{d~=f$#q
i(3}^`)SMUpm;M4;egj_jB)Fmg0000<MNUMnLSTYMtZUN%

delta 543
zcmV+)0^t3n2i66UBqttFOjJd{z`#Nh3zB|IV+RboL^6~#CDO54ut+)E$YQNGCFv^y
zT#-(pe*x4<L_t(oh3!{CPQx$|T>l`B$$?|kihF96d%=ykhN=>0Xwx$i!r}oufCEDP
zEp}DZT{~t85+ER>_Asd@Ysbz`2VlT|f+(dd3HP5g2U+T>%rJKY5YJ~)o*@ouq|_+G
zJR>|e#$bU^mnvUK%rnA|#>R{#66krmo>ysZf9ke1GbEVS=QSP>^1GEWt6MBsU6^&1
z=GO5I5!CvWR-oK&tfhiQd$X+4{N=uF?bAU3N=m7+Bo|w2?E@Bw{Wryrw+?vYI23OD
za}R+imJX61_y+06FPo2-_=G@fJ?$Y7$_aFjHGp*Et3HoaxQ*;nV8DQ%L*x(O4lg<G
ze*(yH4*kNlg(ky&2r_@=KtsRqZ@HubiQ7u(7rr&><^&6_3oX-r;VOWdG+0oKDnJzi
zzi=}EF}cEmM>k`E1k^8ff}B<;set;07l5K`sDKElU-&hEz#P0epr;c0$L?mq#*qu5
zUr>VPnZ#cZbav+V+I8p6I?L{V>K62IZIA&2z6){xXAtEB#xLT0!1zU!4;a6Q^8w=*
zaXw)DBF+blU&Q%<@ryVgFn$r|1I{m^e8Bldln=OG8|4E|5dGc%0zr@u*foUtfc1+o
hAFzHA<bz-47q2|=b-sx(OyB?j002ovPDHLkV1hd2{U`tc

diff --git a/icons/clothing/suits/capes/dominia_red.dmi b/icons/clothing/suits/capes/dominia_red.dmi
index 5a3a535348ed04ca3215f6a30cf4fc3d558c46c3..16ed401fe0e69a917e66e18ec6163b8a7b6ba2c0 100644
GIT binary patch
delta 1026
zcmV+d1pWKS1?vc3iBL{Q4GJ0x0000DNk~Le0001>0001h1Oos70Det>C;$KeAy7<I
zMZmzoV+RaK1qi!DGInP_LJ|v<G$qopTHDBCrHoIKeoO3S;M@QJ00DGTPE!Ct=GbNc
z005PdTzP*oG?kO#x(sskkmsii@_dzn+h58Gu6{1yhy?&M_?1f{>AXb%00UP^L_t(&
zf$f;FZrd;rhH0YOBdamc%~TT4buJK+v2S3hV1{mr3bh^607d%-nY(0ex4va5BN6XT
ziW%$DAq9VUh$!CApQ5dNIHjVZrfQz&2hZs@JF|b~`Z*2L<~pl!#Dnd}Yq|Y+>6}~S
z`2MU(&(~Rv2F}zBCr;){|HS3y_AB$t=ICk#Mf&EZ@R@kx5^{5mBIvutCz^P%UZa6(
z0Z@Ft=^c3DWZuB}97Q;u=PMG?T;(~se_|Tv_@#H?iOXVjalJwjstit#v0-J}`UDwP
ziw1v+;+Nk5P5d5QfCd?sr-nQ;^=<*hAu_aX(*=C=J0OXZ41Tmt1DpQ7U21~@DfPk4
zf9)@|wWevopDRtA!1rzeWLUYuifs7~E`Afk&cYjRG*0~LPXW%b@P?&gvd!%`{0z2x
z2K>##i4$-E0cvk(xMAsbgbnq;P@}|?4Qqcqf)+@+9lHW=s7DOp3J;uE!<N8_FSh~F
zvFf)WLp^5LC%$9>m9CcoLzSDNCSO&&K-m=JhoF+Mp)z$!UP;ujO>w~P?L(C;28NpY
zDV(@$Yir5fjiPdfEnkGaGI8Q0J>(7p!#1_Mr;x-p;OCYM`3({W3~kUaDk|zFO2~hM
zgL)|s@_I23@_H!`4hUGvg98GV@*uC5^B^N&IS(=dmh&L3zYi_qK}88ziFuIJ-w()m
zP%~ha^Wd1Fga<VvU^x#mV3qUW&``*OoPfnV$O%}?gPefnJh)eVR8-Vfv46;UPd|76
z&`jtb!ujL<Lp`m3c=2fe&^&<`VLgB79|Gwg;>1T`UUUVde^{nz3uk@@B(Z)1FJ=I=
zf7o>pS^uz4tf%x3t*wkdh0P2negZEh=Jtm64?9QpkGfB+vmo9nZ5rC{>$GH3JadN)
z-NA<pyPwCyepVq~bd!!qdAH|^P1*D_Y<KEAdC`d)>Y*P7q^>KylNY=1E**c$^T8A}
zkeC23c80roD4~~CfES(2ZbSCiIUJ1?C&QtrsHmuyr+?i)+?NM~{lk5EFw{TXmj{FW
z!+m*hw0|h!L0&KCK}NuG9%KY8=RsQE#}@D)sqd!<c#zchBN86O^$!y9AgO;C@PAI=
w!4ZH$6DIK>og(GI0nABxaO4`;qW)j~1!8Vtw{*8APyhe`07*qoM6N<$f;$=Fv;Y7A

delta 603
zcmV-h0;K)x2*?FoiBL{Q4GJ0x0000DNk~Le0001B0001B1Oos701&on3jhEB9#BkF
zMZmzoLJ|vO2MkCB2)jfwlr$xheoLxDG~38xp+-2#VfL~B0004WQchC<K<3zH0001l
zkzaX#T$+>>T>V_Yo&f-1p+I@DJXP)h00GEJL_t(oh3%I=Ps1<}#qSno+iC@ju_$6i
ze1f7>>6(Zzx9Y%*RLOKNLW~TR=(ptxNchf4PMP?ZQ<rDw=S$M|o*uwZ|Eeq%(}1x?
zp#ih2%gn@@K9ROlYo`pTR?gd4FPOG@p5HTnpkBG_=t!&=vBpuJ7raA#v7LF-rjZ(~
zd51|g&nwfW2`CB%fV;`J5g;@H>%akYXY;aEBQ+2JT`^m<>LY3pUO*D2RpVVzY$O0^
z+V#mgq(E1Vp2EJ=FZ*hC{IKZ-*djdddI2H4*8PCZ?lJ2D;OTyMyX*mg-PiuS4}kK2
zA34-eKewbmkf8vZG6?MFEd2s-TpEl4b6AP?g<pX6wdH`VnZa<spkZx&$vtlDZ59LE
zKj@j<gpHALl|kG=_y;{OdJfQW@jXiapk2p-j04g?h;?jG9Ta;D!awZ$tBwH!z`rT(
zANbLwV?p=_LPMFR#XkfzPUfz0-FR4bW82TIW}xeyh8pU-D#-_0CHX+{izFYYej)RL
z>K8H}sD2^yf$A4BA83A&<O9twl6;`~MUoFxzmWMr^$VE~v{{?v0}V*>feOfcpaUWw
psLvqtf$A4BAE<sI^1(0ji#M+7Xn?mh;hO*e002ovPDHLkV1oGO5$^y1

diff --git a/icons/clothing/under/uniforms/dominia_dresses.dmi b/icons/clothing/under/uniforms/dominia_dresses.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..9a65e02ddc2c57c205d23f9a5dd4ad9a9a0e8529
GIT binary patch
literal 6765
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

literal 0
HcmV?d00001


From 082aad67b041276dff4a2e28504326ee0381d9cb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 8 Feb 2021 19:16:05 +0000
Subject: [PATCH 2/6] "[ci skip] Automatic Build - 2021.02.08.19.16.05"

---
 html/changelog.html                           |  8 ++++
 html/changelogs/.all_changelog.yml            |  6 +++
 .../mattatlas-thiswasmoreworkthanbrainmed.yml | 43 -------------------
 3 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5e43f69928a..fda7fa229eb 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,14 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">08 February 2021</h2>
+			<h3 class="author">MattAtlas, DasFox updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new fancy Dominian dresses under a new loadout selection.</li>
+				<li class="imageadd">Updated the tribunal cape.</li>
+				<li class="rscadd">Added a verb to the red tribunalist cape that allows you to hide part of it.</li>
+			</ul>
+
 			<h2 class="date">07 February 2021</h2>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 18fe598b8ff..70d90f36ed6 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18214,3 +18214,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds colorable belts.
   - tweak: Fannypacks are now recolorable.
   - rscadd: Belts now have a dedicated loadout section.
+2021-02-08:
+  MattAtlas, DasFox:
+  - rscadd: Added new fancy Dominian dresses under a new loadout selection.
+  - imageadd: Updated the tribunal cape.
+  - rscadd: Added a verb to the red tribunalist cape that allows you to hide part
+      of it.
diff --git a/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml b/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml
deleted file mode 100644
index 0a35157392a..00000000000
--- a/html/changelogs/mattatlas-thiswasmoreworkthanbrainmed.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: MattAtlas, DasFox
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - rscadd: "Added new fancy Dominian dresses under a new loadout selection."
-  - imageadd: "Updated the tribunal cape."
-  - rscadd: "Added a verb to the red tribunalist cape that allows you to hide part of it."

From 09bede224e9ac6557eccbb23d81be9d16164c20f Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Tue, 9 Feb 2021 22:28:41 +0200
Subject: [PATCH 3/6] Belt Fix (#11162)

---
 aurorastation.dme                               |  2 +-
 code/game/objects/items/weapons/storage/belt.dm |  4 ++--
 .../mob/living/carbon/human/update_icons.dm     | 17 +++++------------
 html/changelogs/geeves-belt_fix.yml             |  6 ++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 html/changelogs/geeves-belt_fix.yml

diff --git a/aurorastation.dme b/aurorastation.dme
index 6487ea3ef52..bab50c9d1db 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -2208,8 +2208,8 @@
 #include "code\modules\modular_computers\file_system\data.dm"
 #include "code\modules\modular_computers\file_system\news_article.dm"
 #include "code\modules\modular_computers\file_system\program.dm"
-#include "code\modules\modular_computers\file_system\script.dm"
 #include "code\modules\modular_computers\file_system\program_events.dm"
+#include "code\modules\modular_computers\file_system\script.dm"
 #include "code\modules\modular_computers\file_system\programs\_program.dm"
 #include "code\modules\modular_computers\file_system\programs\app_presets.dm"
 #include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 0a60fea5778..7686c0d5bb5 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -31,7 +31,7 @@
 	update_clothing_icon()
 
 /obj/item/storage/belt/Initialize()
-	..()
+	. = ..()
 	update_flip_verb()
 
 /obj/item/storage/belt/proc/update_flip_verb()
@@ -52,7 +52,7 @@
 
 	flipped = !flipped
 	icon_state = "[initial(icon_state)][flipped ? "_flip" : ""]"
-	item_state = icon_state
+	item_state = "[initial(item_state)][flipped ? "_flip" : ""]"
 	to_chat(usr, SPAN_NOTICE("You change \the [src] to be [src.flipped ? "behind" : "in front of"] you."))
 	update_clothing_icon()
 
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 5dfc9664abd..5fb5ecedc3d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -969,7 +969,6 @@ There are several things that need to be remembered:
 		if(belt.contained_sprite)
 			belt.auto_adapt_species(src)
 			var/t_state = "[UNDERSCORE_OR_NULL(belt.icon_species_tag)][belt.item_state][WORN_BELT]"
-
 			result_layer = image(belt.icon_override || belt.icon, t_state)
 		else if(belt.icon_override)
 			t_icon = belt.icon_override
@@ -977,11 +976,9 @@ There are several things that need to be remembered:
 			t_icon = belt.sprite_sheets[GET_BODY_TYPE]
 		else if(belt.item_icons && (slot_belt_str in belt.item_icons))
 			t_icon = belt.item_icons[slot_belt_str]
-		else
-			t_icon = INV_BELT_DEF_ICON
 
 		if(!result_layer) //Create the image
-			result_layer = image(t_icon, belt.icon_state)
+			result_layer = image(t_icon, belt.item_state)
 
 		if(belt.color)
 			result_layer.color = belt.color
@@ -989,11 +986,11 @@ There are several things that need to be remembered:
 		result_layer.appearance_flags = RESET_ALPHA
 		var/image/worn_overlays = belt.worn_overlays(t_icon)
 		if(worn_overlays)
-			result_layer.overlays.Add(worn_overlays)
+			result_layer.add_overlay(worn_overlays)
 
 		var/list/ovr
 
-		if(belt.contents.len && istype(belt, /obj/item/storage/belt))
+		if(length(belt.contents) && istype(belt, /obj/item/storage/belt))
 			ovr = list(result_layer)
 			for(var/obj/item/i in belt.contents)
 				var/c_state
@@ -1005,10 +1002,9 @@ There are several things that need to be remembered:
 					c_icon = INV_BELT_DEF_ICON
 					c_state = i.item_state || i.icon_state
 				var/image/belt_item_image = image(c_icon, c_state)
-				if(i.color)
-					belt_item_image.color = i.color
+				belt_item_image.color = i.color
 				belt_item_image.appearance_flags = RESET_ALPHA
-				ovr += image(c_icon, c_state)
+				ovr += belt_item_image
 
 		var/belt_layer = BELT_LAYER
 		if(istype(belt, /obj/item/storage/belt))
@@ -1024,9 +1020,6 @@ There are several things that need to be remembered:
 	if(update_icons)
 		update_icon()
 
-	if (QDELING(src))
-		return
-
 /mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1)
 	if (QDELING(src))
 		return
diff --git a/html/changelogs/geeves-belt_fix.yml b/html/changelogs/geeves-belt_fix.yml
new file mode 100644
index 00000000000..e9073b5f0e3
--- /dev/null
+++ b/html/changelogs/geeves-belt_fix.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes belts missing their sprites and having uncoloured overlays."
\ No newline at end of file

From 47dbdd91413535681c4921dd330dac21a9e23769 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 9 Feb 2021 20:29:39 +0000
Subject: [PATCH 4/6] "[ci skip] Automatic Build - 2021.02.09.20.29.39"

---
 html/changelog.html                 | 6 ++++++
 html/changelogs/.all_changelog.yml  | 3 +++
 html/changelogs/geeves-belt_fix.yml | 6 ------
 3 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/geeves-belt_fix.yml

diff --git a/html/changelog.html b/html/changelog.html
index fda7fa229eb..87dfb8eda9f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">09 February 2021</h2>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes belts missing their sprites and having uncoloured overlays.</li>
+			</ul>
+
 			<h2 class="date">08 February 2021</h2>
 			<h3 class="author">MattAtlas, DasFox updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 70d90f36ed6..1b5bd866ec7 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -18220,3 +18220,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - imageadd: Updated the tribunal cape.
   - rscadd: Added a verb to the red tribunalist cape that allows you to hide part
       of it.
+2021-02-09:
+  Geeves:
+  - bugfix: Fixes belts missing their sprites and having uncoloured overlays.
diff --git a/html/changelogs/geeves-belt_fix.yml b/html/changelogs/geeves-belt_fix.yml
deleted file mode 100644
index e9073b5f0e3..00000000000
--- a/html/changelogs/geeves-belt_fix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - bugfix: "Fixes belts missing their sprites and having uncoloured overlays."
\ No newline at end of file

From 59387c6e6277254857bb437ac4547b70410c8b09 Mon Sep 17 00:00:00 2001
From: Werner <1331699+Arrow768@users.noreply.github.com>
Date: Tue, 9 Feb 2021 22:58:22 +0100
Subject: [PATCH 5/6] Update TGS API to 6.0.2 (#11148)

---
 code/__defines/tgs.dm                  | 111 +++++++++++++------------
 code/datums/helper_datums/getrev.dm    |   3 +-
 code/modules/tgs/core/core.dm          |   6 +-
 code/modules/tgs/includes.dm           |   2 +-
 code/modules/tgs/v3210/api.dm          |   6 +-
 code/modules/tgs/v3210/commands.dm     |   6 ++
 code/modules/tgs/v4/api.dm             |  15 +---
 code/modules/tgs/v5/README.md          |   8 ++
 code/modules/tgs/v5/_defines.dm        |   1 +
 code/modules/tgs/v5/api.dm             |  34 ++++----
 code/modules/tgs/v5/interop_version.dm |   1 +
 code/modules/tgs/v5/undefs.dm          |  99 ++++++++++++++++++++++
 code/world.dm                          |   2 +-
 13 files changed, 206 insertions(+), 88 deletions(-)
 create mode 100644 code/modules/tgs/v5/README.md
 create mode 100644 code/modules/tgs/v5/interop_version.dm
 create mode 100644 code/modules/tgs/v5/undefs.dm

diff --git a/code/__defines/tgs.dm b/code/__defines/tgs.dm
index 4015d24808d..7665982f8e6 100644
--- a/code/__defines/tgs.dm
+++ b/code/__defines/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.2"
+#define TGS_DMAPI_VERSION "6.0.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -67,7 +67,7 @@
 #define TGS_EVENT_REPO_CHECKOUT 1
 /// When the repository performs a fetch operation. No parameters
 #define TGS_EVENT_REPO_FETCH 2
-/// When the repository merges a pull request. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
+/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
 #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3
 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path
 #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4
@@ -95,8 +95,13 @@
 #define TGS_EVENT_WATCHDOG_SHUTDOWN 15
 /// Before the watchdog detaches for a TGS update/restart. No parameters.
 #define TGS_EVENT_WATCHDOG_DETACH 16
-// We don't actually implement this value as the DMAPI can never receive it
+// We don't actually implement these 4 events as the DMAPI can never receive them.
 // #define TGS_EVENT_WATCHDOG_LAUNCH 17
+// #define TGS_EVENT_WATCHDOG_CRASH 18
+// #define TGS_EVENT_WORLD_END_PROCESS 19
+// #define TGS_EVENT_WORLD_REBOOT 20
+/// Watchdog event when TgsInitializationComplete() is called. No parameters.
+#define TGS_EVENT_WORLD_PRIME 21
 
 // OTHER ENUMS
 
@@ -145,6 +150,7 @@
 /world/proc/TgsReboot()
 	return
 
+
 // DATUM DEFINITIONS
 // All datums defined here should be considered read-only
 
@@ -152,6 +158,8 @@
 /datum/tgs_revision_information
 	/// Full SHA of the commit.
 	var/commit
+	/// ISO 8601 timestamp of when the commit was created
+	var/timestamp
 	/// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch.
 	var/origin_commit
 
@@ -174,37 +182,36 @@
 	/// String value minus prefix
 	var/deprefixed_parameter
 
+
 /**
-  * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] contains wildcards.
-  */
+ * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] contains wildcards.
+ */
 /datum/tgs_version/proc/Wildcard()
 	return
 
 /**
-  * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] equals some other version.
-  *
-  * other_version - The [/datum/tgs_version] to compare against.
-  */
+ * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] equals some other version.
+ *
+ * other_version - The [/datum/tgs_version] to compare against.
+ */
 /datum/tgs_version/proc/Equals(datum/tgs_version/other_version)
 	return
 
 /// Represents a merge of a GitHub pull request.
 /datum/tgs_revision_information/test_merge
-	/// The pull request number.
+	/// The test merge number.
 	var/number
-	/// The pull request title when it was merged.
+	/// The test merge source's title when it was merged.
 	var/title
-	/// The pull request body when it was merged.
+	/// The test merge source's body when it was merged.
 	var/body
-	/// The GitHub username of the pull request's author.
+	/// The Username of the test merge source's author.
 	var/author
-	/// An http URL to the pull request.
+	/// An http URL to the test merge source.
 	var/url
-	/// The SHA of the pull request when that was merged.
-	var/pull_request_commit
-	/// ISO 8601 timestamp of when the pull request was merged.
-	var/time_merged
-	/// (Nullable) Comment left by the TGS user who initiated the merge..
+	/// The SHA of the test merge when that was merged.
+	var/head_commit
+	/// Optional comment left by the TGS user who initiated the merge.
 	var/comment
 
 /// Represents a connected chat channel.
@@ -234,10 +241,10 @@
 	var/datum/tgs_chat_channel/channel
 
 /**
-  * User definable callback for handling TGS events.
-  *
-  * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each
-  */
+ * User definable callback for handling TGS events.
+ *
+ * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each
+ */
 /datum/tgs_event_handler/proc/HandleEvent(event_code, ...)
 	set waitfor = FALSE
 	return
@@ -252,67 +259,67 @@
 	var/admin_only = FALSE
 
 /**
-  * Process command activation. Should return a string to respond to the issuer with.
-  *
-  * sender - The [/datum/tgs_chat_user] who issued the command.
-  * params - The trimmed string following the command `/datum/tgs_chat_command/var/name].
-  */
+ * Process command activation. Should return a string to respond to the issuer with.
+ *
+ * sender - The [/datum/tgs_chat_user] who issued the command.
+ * params - The trimmed string following the command `/datum/tgs_chat_command/var/name].
+ */
 /datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params)
 	CRASH("[type] has no implementation for Run()")
 
 // API FUNCTIONS
 
 /// Returns the maximum supported [/datum/tgs_version] of the DMAPI.
-/world/proc/TgsMaximumAPIVersion()
+/world/proc/TgsMaximumApiVersion()
 	return
 
 /// Returns the minimum supported [/datum/tgs_version] of the DMAPI.
-/world/proc/TgsMinimumAPIVersion()
+/world/proc/TgsMinimumApiVersion()
 	return
 
 /**
-  * Returns [TRUE] if DreamDaemon was launched under TGS, the API matches, and was properly initialized. [FALSE] will be returned otherwise.
-  */
+ * Returns [TRUE] if DreamDaemon was launched under TGS, the API matches, and was properly initialized. [FALSE] will be returned otherwise.
+ */
 /world/proc/TgsAvailable()
 	return
 
 // No function below this succeeds if it TgsAvailable() returns FALSE or if TgsNew() has yet to be called.
 
 /**
-  * Forces a hard reboot of DreamDaemon by ending the process.
-  *
-  * Unlike del(world) clients will try to reconnect.
-  * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again
-  */
+ * Forces a hard reboot of DreamDaemon by ending the process.
+ *
+ * Unlike del(world) clients will try to reconnect.
+ * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again
+ */
 /world/proc/TgsEndProcess()
 	return
 
 /**
-  * Send a message to connected chats.
-  *
-  * message - The string to send.
-  * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies.
-  */
+ * Send a message to connected chats.
+ *
+ * message - The string to send.
+ * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies.
+ */
 /world/proc/TgsTargetedChatBroadcast(message, admin_only = FALSE)
 	return
 
 /**
-  * Send a private message to a specific user.
-  *
-  * message - The string to send.
-  * user: The [/datum/tgs_chat_user] to PM.
-  */
+ * Send a private message to a specific user.
+ *
+ * message - The string to send.
+ * user: The [/datum/tgs_chat_user] to PM.
+ */
 /world/proc/TgsChatPrivateMessage(message, datum/tgs_chat_user/user)
 	return
 
 // The following functions will sleep if a call to TgsNew() is sleeping
 
 /**
-  * Send a message to connected chats that are flagged as game-related in TGS.
-  *
-  * message - The string to send.
-  * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to.
-  */
+ * Send a message to connected chats that are flagged as game-related in TGS.
+ *
+ * message - The string to send.
+ * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to.
+ */
 /world/proc/TgsChatBroadcast(message, list/channels = null)
 	return
 
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 32eb4c33b40..e27e5354658 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -120,10 +120,11 @@ client/verb/showrevinfo()
 	. += {"</tr><tr><td class="hiddenRow"><div id="[divid]" class="collapse">"}
 	. += {"<table class="table">"}
 	. += {"<tr><th>Author:</th><td>[html_encode(tm.author)]</td></tr>"}
-	. += {"<tr><th>Merged:</th><td>[tm.time_merged]</td></tr>"}
 
 	if (config.githuburl)
 		. += {"<tr><td colspan="2"><a href="?JSlink=github;pr=[tm.number]">Link to Github</a></td></tr>"}
 
 	. += {"<tr><th>Description:</th><td>[html_encode(tm.body)]</td></tr>"}
+	if(tm.comment)
+		. += {"<tr><th>Comment:</th><td>[html_encode(tm.comment)]</td></tr>"}
 	. += {"</table></div></td></tr>"}
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index f75e7837af0..41a04733945 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -40,7 +40,7 @@
 		if(5)
 			api_datum = /datum/tgs_api/v5
 
-	var/datum/tgs_version/max_api_version = TgsMaximumAPIVersion();
+	var/datum/tgs_version/max_api_version = TgsMaximumApiVersion();
 	if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter)
 		TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.")
 		api_datum = /datum/tgs_api/latest
@@ -64,10 +64,10 @@
 		TGS_WRITE_GLOBAL(tgs, null)
 		TGS_ERROR_LOG("Failed to activate API!")
 
-/world/TgsMaximumAPIVersion()
+/world/TgsMaximumApiVersion()
 	return new /datum/tgs_version("5.x.x")
 
-/world/TgsMinimumAPIVersion()
+/world/TgsMinimumApiVersion()
 	return new /datum/tgs_version("3.2.x")
 
 /world/TgsInitializationComplete()
diff --git a/code/modules/tgs/includes.dm b/code/modules/tgs/includes.dm
index c803cf7ac26..4018074f4e3 100644
--- a/code/modules/tgs/includes.dm
+++ b/code/modules/tgs/includes.dm
@@ -14,4 +14,4 @@
 #include "v5\_defines.dm"
 #include "v5\api.dm"
 #include "v5\commands.dm"
-#include "v5\undef.dm"
+#include "v5\undefs.dm"
diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm
index e0d00ad15d1..245381b93ea 100644
--- a/code/modules/tgs/v3210/api.dm
+++ b/code/modules/tgs/v3210/api.dm
@@ -39,7 +39,7 @@
 	var/warned_custom_commands = FALSE
 
 /datum/tgs_api/v3210/ApiVersion()
-	return new /datum/tgs_version("3.2.1.0")
+	return new /datum/tgs_version("3.2.1.3")
 
 /datum/tgs_api/v3210/proc/trim_left(text)
 	for (var/i = 1 to length(text))
@@ -160,7 +160,7 @@
 		var/datum/tgs_revision_information/test_merge/tm = new
 		tm.number = text2num(I)
 		var/list/entry = json[I]
-		tm.pull_request_commit = entry["commit"]
+		tm.head_commit = entry["commit"]
 		tm.author = entry["author"]
 		tm.title = entry["title"]
 		. += tm
@@ -180,7 +180,7 @@
 	ExportService(SERVICE_REQUEST_KILL_PROCESS)
 
 /datum/tgs_api/v3210/ChatChannelInfo()
-	return list()
+	return list() // :omegalul:
 
 /datum/tgs_api/v3210/ChatBroadcast(message, list/channels)
 	if(channels)
diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm
index a1949da444d..4ccfc1a8a60 100644
--- a/code/modules/tgs/v3210/commands.dm
+++ b/code/modules/tgs/v3210/commands.dm
@@ -42,5 +42,11 @@
 	var/datum/tgs_chat_command/stc = new command_type
 	var/datum/tgs_chat_user/user = new
 	user.friendly_name = sender
+
+	// Discord hack, fix the mention if it's only numbers (fuck you IRC trolls)
+	var/regex/discord_id_regex = regex(@"^[0-9]+$")
+	if(findtext(sender, discord_id_regex))
+		sender = "<@[sender]>"
+
 	user.mention = sender
 	return stc.Run(user, params) || TRUE
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index 5e7f3c60bed..4eb8e67d928 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -92,7 +92,7 @@
 	var/list/json = cached_json["testMerges"]
 	for(var/entry in json)
 		var/datum/tgs_revision_information/test_merge/tm = new
-		tm.time_merged = text2num(entry["timeMerged"])
+		tm.timestamp = text2num(entry["timeMerged"])
 
 		var/list/revInfo = entry["revision"]
 		if(revInfo)
@@ -104,7 +104,7 @@
 		tm.url = entry["url"]
 		tm.author = entry["author"]
 		tm.number = entry["number"]
-		tm.pull_request_commit = entry["pullRequestRevision"]
+		tm.head_commit = entry["pullRequestRevision"]
 		tm.comment = entry["comment"]
 
 		cached_test_merges += tm
@@ -114,15 +114,6 @@
 /datum/tgs_api/v4/OnInitializationComplete()
 	Export(TGS4_COMM_SERVER_PRIMED)
 
-	var/tgs4_secret_sleep_offline_sauce = 29051994
-	var/old_sleep_offline = world.sleep_offline
-	world.sleep_offline = tgs4_secret_sleep_offline_sauce
-	sleep(1)
-	if(world.sleep_offline == tgs4_secret_sleep_offline_sauce)	//if not someone changed it
-		world.sleep_offline = old_sleep_offline
-	else
-		TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!")
-
 /datum/tgs_api/v4/OnTopic(T)
 	var/list/params = params2list(T)
 	var/their_sCK = params[TGS4_INTEROP_ACCESS_IDENTIFIER]
@@ -257,7 +248,7 @@
 	return instance_name
 
 /datum/tgs_api/v4/TestMerges()
-	return cached_test_merges
+	return cached_test_merges.Copy()
 
 /datum/tgs_api/v4/EndProcess()
 	Export(TGS4_COMM_END_PROCESS)
diff --git a/code/modules/tgs/v5/README.md b/code/modules/tgs/v5/README.md
new file mode 100644
index 00000000000..5b48d57a1f0
--- /dev/null
+++ b/code/modules/tgs/v5/README.md
@@ -0,0 +1,8 @@
+# DMAPI V5
+
+This DMAPI implements bridge requests using HTTP GET requests to TGS. It has no security restrictions.
+
+- [_defines.dm](./_defines.dm) contains constant definitions.
+- [api.dm](./api.dm) contains the bulk of the API code.
+- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s.
+- [undefs.dm](./undefs.dm) Undoes the work of `_defines.dm`.
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 8fd84e19fa3..10bc4cbe406 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -79,6 +79,7 @@
 #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"
 
 #define DMAPI5_REVISION_INFORMATION_COMMIT_SHA "commitSha"
+#define DMAPI5_REVISION_INFORMATION_TIMESTAMP "timestamp"
 #define DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA "originCommitSha"
 
 #define DMAPI5_CHAT_USER_ID "id"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 3791cbde843..6735ed5dec5 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -15,8 +15,12 @@
 	var/datum/tgs_revision_information/revision
 	var/list/chat_channels
 
+	var/initialized = FALSE
+
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version("5.2.2")
+	return new /datum/tgs_version(
+		#include "interop_version.dm"
+	)
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -46,6 +50,7 @@
 	if(istype(revisionData))
 		revision = new
 		revision.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA]
+		revision.timestamp = revisionData[DMAPI5_REVISION_INFORMATION_TIMESTAMP]
 		revision.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA]
 	else
 		TGS_ERROR_LOG("Failed to decode [DMAPI5_RUNTIME_INFORMATION_REVISION] from runtime information!")
@@ -61,15 +66,18 @@
 			if(revInfo)
 				tm.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA]
 				tm.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA]
+				tm.timestamp = entry[DMAPI5_REVISION_INFORMATION_TIMESTAMP]
 			else
 				TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!")
 
-			tm.time_merged = text2num(entry[DMAPI5_TEST_MERGE_TIME_MERGED])
+			if(!tm.timestamp)
+				tm.timestamp = entry[DMAPI5_TEST_MERGE_TIME_MERGED]
+
 			tm.title = entry[DMAPI5_TEST_MERGE_TITLE_AT_MERGE]
 			tm.body = entry[DMAPI5_TEST_MERGE_BODY_AT_MERGE]
 			tm.url = entry[DMAPI5_TEST_MERGE_URL]
 			tm.author = entry[DMAPI5_TEST_MERGE_AUTHOR]
-			tm.pull_request_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
+			tm.head_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
 			tm.comment = entry[DMAPI5_TEST_MERGE_COMMENT]
 
 			test_merges += tm
@@ -79,6 +87,7 @@
 	chat_channels = list()
 	DecodeChannels(runtime_information)
 
+	initialized = TRUE
 	return TRUE
 
 /datum/tgs_api/v5/proc/RequireInitialBridgeResponse()
@@ -88,15 +97,6 @@
 /datum/tgs_api/v5/OnInitializationComplete()
 	Bridge(DMAPI5_BRIDGE_COMMAND_PRIME)
 
-	var/tgs4_secret_sleep_offline_sauce = 29051994
-	var/old_sleep_offline = world.sleep_offline
-	world.sleep_offline = tgs4_secret_sleep_offline_sauce
-	sleep(1)
-	if(world.sleep_offline == tgs4_secret_sleep_offline_sauce)	//if not someone changed it
-		world.sleep_offline = old_sleep_offline
-	else
-		TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!")
-
 /datum/tgs_api/v5/proc/TopicResponse(error_message = null)
 	var/list/response = list()
 	response[DMAPI5_RESPONSE_ERROR_MESSAGE] = error_message
@@ -107,12 +107,16 @@
 	var/list/params = params2list(T)
 	var/json = params[DMAPI5_TOPIC_DATA]
 	if(!json)
-		return FALSE	//continue world/Topic
+		return FALSE // continue to /world/Topic
 
 	var/list/topic_parameters = json_decode(json)
 	if(!topic_parameters)
 		return TopicResponse("Invalid topic parameters json!");
 
+	if(!initialized)
+		TGS_WARNING_LOG("Missed topic due to not being initialized: [T]")
+		return TRUE	// too early to handle, but it's still our responsibility
+
 	var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER]
 	if(their_sCK != access_identifier)
 		return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] from: [json]!");
@@ -284,7 +288,7 @@
 
 /datum/tgs_api/v5/TestMerges()
 	RequireInitialBridgeResponse()
-	return test_merges
+	return test_merges.Copy()
 
 /datum/tgs_api/v5/EndProcess()
 	Bridge(DMAPI5_BRIDGE_COMMAND_KILL)
@@ -329,7 +333,7 @@
 
 /datum/tgs_api/v5/ChatChannelInfo()
 	RequireInitialBridgeResponse()
-	return chat_channels
+	return chat_channels.Copy()
 
 /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json)
 	var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS]
diff --git a/code/modules/tgs/v5/interop_version.dm b/code/modules/tgs/v5/interop_version.dm
new file mode 100644
index 00000000000..c7bf62ecae3
--- /dev/null
+++ b/code/modules/tgs/v5/interop_version.dm
@@ -0,0 +1 @@
+"5.3.0"
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
new file mode 100644
index 00000000000..5885a60e75c
--- /dev/null
+++ b/code/modules/tgs/v5/undefs.dm
@@ -0,0 +1,99 @@
+#undef DMAPI5_PARAM_SERVER_PORT
+#undef DMAPI5_PARAM_ACCESS_IDENTIFIER
+
+#undef DMAPI5_BRIDGE_DATA
+#undef DMAPI5_TOPIC_DATA
+
+#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE
+#undef DMAPI5_BRIDGE_COMMAND_STARTUP
+#undef DMAPI5_BRIDGE_COMMAND_PRIME
+#undef DMAPI5_BRIDGE_COMMAND_REBOOT
+#undef DMAPI5_BRIDGE_COMMAND_KILL
+#undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND
+
+#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
+#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
+
+#undef DMAPI5_RESPONSE_ERROR_MESSAGE
+
+#undef DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE
+#undef DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT
+#undef DMAPI5_BRIDGE_PARAMETER_VERSION
+#undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE
+#undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL
+
+#undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT
+#undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION
+
+#undef DMAPI5_CHAT_MESSAGE_TEXT
+#undef DMAPI5_CHAT_MESSAGE_CHANNEL_IDS
+
+#undef DMAPI5_RUNTIME_INFORMATION_ACCESS_IDENTIFIER
+#undef DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION
+#undef DMAPI5_RUNTIME_INFORMATION_SERVER_PORT
+#undef DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY
+#undef DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME
+#undef DMAPI5_RUNTIME_INFORMATION_REVISION
+#undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES
+#undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL
+
+#undef DMAPI5_CHAT_UPDATE_CHANNELS
+
+#undef DMAPI5_TEST_MERGE_TIME_MERGED
+#undef DMAPI5_TEST_MERGE_REVISION
+#undef DMAPI5_TEST_MERGE_TITLE_AT_MERGE
+#undef DMAPI5_TEST_MERGE_BODY_AT_MERGE
+#undef DMAPI5_TEST_MERGE_URL
+#undef DMAPI5_TEST_MERGE_AUTHOR
+#undef DMAPI5_TEST_MERGE_NUMBER
+#undef DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION
+#undef DMAPI5_TEST_MERGE_COMMENT
+
+#undef DMAPI5_CHAT_COMMAND_NAME
+#undef DMAPI5_CHAT_COMMAND_PARAMS
+#undef DMAPI5_CHAT_COMMAND_USER
+
+#undef DMAPI5_EVENT_NOTIFICATION_TYPE
+#undef DMAPI5_EVENT_NOTIFICATION_PARAMETERS
+
+#undef DMAPI5_TOPIC_COMMAND_CHAT_COMMAND
+#undef DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION
+#undef DMAPI5_TOPIC_COMMAND_CHANGE_PORT
+#undef DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE
+#undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED
+#undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE
+#undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE
+#undef DMAPI5_TOPIC_COMMAND_HEARTBEAT
+#undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH
+
+#undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE
+#undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND
+#undef DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION
+#undef DMAPI5_TOPIC_PARAMETER_NEW_PORT
+#undef DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE
+#undef DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME
+#undef DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE
+#undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION
+
+#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE
+#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
+
+#undef DMAPI5_REVISION_INFORMATION_COMMIT_SHA
+#undef DMAPI5_REVISION_INFORMATION_TIMESTAMP
+#undef DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA
+
+#undef DMAPI5_CHAT_USER_ID
+#undef DMAPI5_CHAT_USER_FRIENDLY_NAME
+#undef DMAPI5_CHAT_USER_MENTION
+#undef DMAPI5_CHAT_USER_CHANNEL
+
+#undef DMAPI5_CHAT_CHANNEL_ID
+#undef DMAPI5_CHAT_CHANNEL_FRIENDLY_NAME
+#undef DMAPI5_CHAT_CHANNEL_CONNECTION_NAME
+#undef DMAPI5_CHAT_CHANNEL_IS_ADMIN_CHANNEL
+#undef DMAPI5_CHAT_CHANNEL_IS_PRIVATE_CHANNEL
+#undef DMAPI5_CHAT_CHANNEL_TAG
+
+#undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME
+#undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT
+#undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY
diff --git a/code/world.dm b/code/world.dm
index cba467bd0b5..058e0a08da9 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -430,7 +430,7 @@ var/list/world_api_rate_limit = list()
 /proc/establish_db_connection(var/DBConnection/con)
 	if (!config.sql_enabled)
 		return FALSE
-	
+
 	if (!con)
 		error("No DBConnection object passed to establish_db_connection() proc.")
 		return FALSE

From 4da5bdd6eb212e5bbeef5f8b0da6d1f061add7c4 Mon Sep 17 00:00:00 2001
From: Werner <1331699+Arrow768@users.noreply.github.com>
Date: Tue, 9 Feb 2021 22:58:42 +0100
Subject: [PATCH 6/6] Add capability to toggle permission sync for specific
 users. (#11147)

---
 code/modules/admin/admin_ranks.dm  | 3 +++
 code/modules/http/forumuser_api.dm | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index 993a706a40a..295f71fd6ca 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -213,6 +213,9 @@ var/list/forum_groupids_to_ranks = list()
 	if(isnull(user.ckey))
 		log_debug("AdminRanks: [user.forum_name] does not have a ckey linked - Ignoring")
 		return
+	if(user.psync_game_disabled)
+		log_debug("AdminRanks: [user.forum_name] has permsync-game disabled - Ignoring")
+		return
 	var/rights = 0
 
 	for (var/group_id in (user.forum_secondary_groups + user.forum_primary_group))
diff --git a/code/modules/http/forumuser_api.dm b/code/modules/http/forumuser_api.dm
index 20da806c8b3..d3611f354f2 100644
--- a/code/modules/http/forumuser_api.dm
+++ b/code/modules/http/forumuser_api.dm
@@ -7,6 +7,7 @@ var/global/forumuser_api_key = null
 	var/list/forum_secondary_groups = list()
 	var/discord_id
 	var/ckey
+	var/psync_game_disabled = FALSE
 
 /datum/forum_user/New(data)
 	forum_member_id = data["forum_member_id"]
@@ -18,6 +19,8 @@ var/global/forumuser_api_key = null
 
 	discord_id = data["discord_id"]
 	ckey = data["ckey"]
+	if(data["psync_game_disalbed"] == 1) //This here is needed because the data can be null, 1 or 0
+		psync_game_disabled = TRUE
 
 /datum/http_request/forumuser_api
 
@@ -62,4 +65,3 @@ var/global/forumuser_api_key = null
 	R.body = users
 
 	return R
-