From b0382db43a039c9fcd30ee9e5bf777700a5ccd27 Mon Sep 17 00:00:00 2001
From: Anonymous <unceaseable@aaathats3as.com>
Date: Wed, 1 Aug 2018 19:20:53 +0300
Subject: [PATCH] Adds medieval+crusader armor and the ways of getting them

One force-push commit edition
---
 code/game/machinery/computer/arcade.dm        |   4 +
 code/game/objects/structures/trash_pile.dm    |   4 +
 .../code/datums/supplypacks/contraband_cit.dm |  30 +++
 .../code/datums/supplypacks/costumes_cit.dm   |  28 +++
 .../modules/clothing/suits/medieval_armor.dm  | 198 ++++++++++++++++++
 modular_citadel/icons/mob/medieval_armor.dmi  | Bin 0 -> 3496 bytes
 modular_citadel/icons/mob/medieval_helmet.dmi | Bin 0 -> 1460 bytes
 .../icons/obj/clothing/medieval_armor.dmi     | Bin 0 -> 1529 bytes
 .../icons/obj/clothing/medieval_helmet.dmi    | Bin 0 -> 971 bytes
 vorestation.dme                               |   7 +-
 10 files changed, 269 insertions(+), 2 deletions(-)
 create mode 100644 modular_citadel/code/datums/supplypacks/contraband_cit.dm
 create mode 100644 modular_citadel/code/datums/supplypacks/costumes_cit.dm
 create mode 100644 modular_citadel/code/modules/clothing/suits/medieval_armor.dm
 create mode 100644 modular_citadel/icons/mob/medieval_armor.dmi
 create mode 100644 modular_citadel/icons/mob/medieval_helmet.dmi
 create mode 100644 modular_citadel/icons/obj/clothing/medieval_armor.dmi
 create mode 100644 modular_citadel/icons/obj/clothing/medieval_helmet.dmi

diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 2bbfc1adc4b..c2d8e1e9ff8 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -11,6 +11,10 @@
 							/obj/item/weapon/gun/projectile/revolver/capgun	= 2,
 							/obj/item/toy/crossbow							= 2,
 							/obj/item/clothing/suit/syndicatefake			= 2,
+							/obj/item/clothing/head/medievalfake			= 2, 	//
+							/obj/item/clothing/suit/medievalfake			= 2, 	// Citadel
+							/obj/item/clothing/suit/medievalfake/crusader	= 2, 	// Addition
+							/obj/item/clothing/head/medievalfake/crusader	= 2, 	//
 							/obj/item/weapon/storage/fancy/crayons			= 2,
 							/obj/item/toy/spinningtoy						= 2,
 							/obj/item/toy/prize/ripley						= 1,
diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm
index 2d5ec7c096b..6a2677deb57 100644
--- a/code/game/objects/structures/trash_pile.dm
+++ b/code/game/objects/structures/trash_pile.dm
@@ -201,6 +201,8 @@
 					prob(1);/obj/item/clothing/under/harness,
 					prob(1);/obj/item/clothing/under/tactical,
 					prob(1);/obj/item/clothing/suit/armor/material/makeshift,
+					prob(1);/obj/item/clothing/head/medievalfake/crusader, //Citadel Addition
+					prob(1);/obj/item/clothing/suit/medievalfake/crusader/dark, //Citadel Addition
 					prob(1);/obj/item/device/flashlight/glowstick/orange,
 					prob(1);/obj/item/device/flashlight/glowstick/red,
 					prob(1);/obj/item/device/flashlight/glowstick/yellow,
@@ -233,6 +235,8 @@
 					prob(2);/obj/item/device/nif/bad, //Citadel Override probability, 0.7%
 					prob(2);/obj/item/device/bodysnatcher, //Citadel Override probability, 0.7%
 					prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
+					prob(1);/obj/item/clothing/head/helmet/medieval/crusader, // Citadel Addition
+					prob(1);/obj/item/clothing/suit/armor/medieval/crusader/dark, // Citadel Addition
 				//	prob(1);/obj/item/device/nif/bad, // VORECode default probability, 0.2%
 					prob(1);/obj/item/device/radio_jammer,
 					prob(1);/obj/item/device/sleevemate,
diff --git a/modular_citadel/code/datums/supplypacks/contraband_cit.dm b/modular_citadel/code/datums/supplypacks/contraband_cit.dm
new file mode 100644
index 00000000000..3c2258fc817
--- /dev/null
+++ b/modular_citadel/code/datums/supplypacks/contraband_cit.dm
@@ -0,0 +1,30 @@
+/datum/supply_packs/supply/medieval
+	name = "Knight set crate"
+	contains = list(
+			/obj/item/clothing/head/helmet/medieval/red = 1,
+			/obj/item/clothing/head/helmet/medieval/green = 1,
+			/obj/item/clothing/head/helmet/medieval/blue = 1,
+			/obj/item/clothing/head/helmet/medieval/yellow = 1,
+			/obj/item/clothing/suit/armor/medieval/red = 1,
+			/obj/item/clothing/suit/armor/medieval/green = 1,
+			/obj/item/clothing/suit/armor/medieval/blue = 1,
+			/obj/item/clothing/suit/armor/medieval/yellow = 1
+			)
+	cost = 100
+	containertype = /obj/structure/closet/crate
+	containername = "knight set crate"
+	contraband = 1
+
+/datum/supply_packs/supply/deusvult
+	name = "Crusader set crate"
+	contains = list(
+			/obj/item/clothing/head/helmet/medieval/crusader/templar = 2,
+			/obj/item/clothing/suit/armor/medieval/crusader/cross/templar = 1,
+			/obj/item/clothing/suit/armor/medieval/crusader/cross/hospitaller = 1,
+			/obj/item/clothing/head/helmet/medieval/crusader = 3,
+			/obj/item/clothing/suit/armor/medieval/crusader/cross = 3
+			)
+	cost = 100
+	containertype = /obj/structure/closet/crate
+	containername = "crusader crate"
+	contraband = 1
diff --git a/modular_citadel/code/datums/supplypacks/costumes_cit.dm b/modular_citadel/code/datums/supplypacks/costumes_cit.dm
new file mode 100644
index 00000000000..c896ae866a0
--- /dev/null
+++ b/modular_citadel/code/datums/supplypacks/costumes_cit.dm
@@ -0,0 +1,28 @@
+/datum/supply_packs/costumes/larp
+	name = "Knight cosplay crate"
+	contains = list(
+			/obj/item/clothing/head/medievalfake/red = 1,
+			/obj/item/clothing/head/medievalfake/green = 1,
+			/obj/item/clothing/head/medievalfake/blue = 1,
+			/obj/item/clothing/head/medievalfake/yellow = 1,
+			/obj/item/clothing/suit/medievalfake/red = 1,
+			/obj/item/clothing/suit/medievalfake/green = 1,
+			/obj/item/clothing/suit/medievalfake/blue = 1,
+			/obj/item/clothing/suit/medievalfake/yellow = 1
+			)
+	cost = 50
+	containertype = /obj/structure/closet/crate
+	containername = "knight cosplay crate"
+
+/datum/supply_packs/costumes/situla_vult
+	name = "Crusader cosplay crate"
+	contains = list(
+			/obj/item/clothing/head/medievalfake/crusader/templar = 2,
+			/obj/item/clothing/suit/medievalfake/crusader/cross/templar = 1,
+			/obj/item/clothing/suit/medievalfake/crusader/cross/hospitaller = 1,
+			/obj/item/clothing/head/medievalfake/crusader = 3,
+			/obj/item/clothing/suit/medievalfake/crusader/cross = 3
+			)
+	cost = 50
+	containertype = /obj/structure/closet/crate
+	containername = "crusader cosplay crate"
diff --git a/modular_citadel/code/modules/clothing/suits/medieval_armor.dm b/modular_citadel/code/modules/clothing/suits/medieval_armor.dm
new file mode 100644
index 00000000000..f0b62573e6f
--- /dev/null
+++ b/modular_citadel/code/modules/clothing/suits/medieval_armor.dm
@@ -0,0 +1,198 @@
+// Helmets
+/obj/item/clothing/head/helmet/medieval
+	name = "medieval helmet"
+	desc = "A classic metal helmet, effective at stopping melee attacks."
+	icon = 'modular_citadel/icons/obj/clothing/medieval_helmet.dmi'
+	icon_override = 'modular_citadel/icons/mob/medieval_helmet.dmi'
+	icon_state = "knight"
+	item_state = "knight"
+	armor = list(melee = 40, bullet = 5, laser = 5, energy = 5, bomb = 5, bio = 0, rad = 0)
+	body_parts_covered = HEAD|FACE|EYES
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
+
+/obj/item/clothing/head/helmet/medieval/red
+	icon_state = "knight_red"
+	item_state = "knight_red"
+
+/obj/item/clothing/head/helmet/medieval/green
+	icon_state = "knight_green"
+	item_state = "knight_green"
+
+/obj/item/clothing/head/helmet/medieval/blue
+	icon_state = "knight_blue"
+	item_state = "knight_blue"
+
+/obj/item/clothing/head/helmet/medieval/yellow
+	icon_state = "knight_yellow"
+	item_state = "knight_yellow"
+
+// Armours
+/obj/item/clothing/suit/armor/medieval
+	name = "plate armour"
+	desc = "A classic suit of plate armour, effective at stopping melee attacks."
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	icon = 'modular_citadel/icons/obj/clothing/medieval_armor.dmi'
+	icon_override = 'modular_citadel/icons/mob/medieval_armor.dmi'
+	icon_state = "knight"
+	item_state = "knight"
+	slowdown = 1
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
+
+/obj/item/clothing/suit/armor/medieval/red
+	icon_state = "knight_red"
+	item_state = "knight_red"
+
+/obj/item/clothing/suit/armor/medieval/green
+	icon_state = "knight_green"
+	item_state = "knight_green"
+
+/obj/item/clothing/suit/armor/medieval/blue
+	icon_state = "knight_blue"
+	item_state = "knight_blue"
+
+/obj/item/clothing/suit/armor/medieval/yellow
+	icon_state = "knight_yellow"
+	item_state = "knight_yellow"
+
+// Crusader stuff
+// Helmets
+/obj/item/clothing/head/helmet/medieval/crusader
+	name = "great helm"
+	desc = "A classic, great metal helmet, effective at stopping melee attacks."
+	icon_state = "crusader"
+	item_state = "crusader"
+
+/obj/item/clothing/head/helmet/medieval/crusader/templar
+	name = "templar great helm"
+	desc = "Deus Vult!"
+	icon_state = "crusader_templar"
+	item_state = "crusader_templar"
+
+// Armours
+/obj/item/clothing/suit/armor/medieval/crusader
+	name = "bland crusader armour"
+	desc = "A classic suit of plate armour, usually worn by crusaders. It doesn't have any insignia."
+	icon_state = "crusader"
+	item_state = "crusader"
+
+/obj/item/clothing/suit/armor/medieval/crusader/cross
+	name = "crusader armour"
+	desc = "God wills it!"
+	icon_state = "crusader_cross"
+	item_state = "crusader_cross"
+
+/obj/item/clothing/suit/armor/medieval/crusader/cross/templar
+	name = "templar crusader armour"
+	icon_state = "crusader_templar"
+	item_state = "crusader_templar"
+
+/obj/item/clothing/suit/armor/medieval/crusader/cross/hospitaller
+	name = "hospitaller crusader armour"
+	icon_state = "crusader_hospitaller"
+	item_state = "crusader_hospitaller"
+
+/obj/item/clothing/suit/armor/medieval/crusader/dark
+	name = "dark crusader armour"
+	desc = "A classic suit of plate armour, usually worn by crusaders. This one is dark, with no insignia."
+	icon_state = "crusader_dark"
+	item_state = "crusader_dark"
+
+//
+/// Replica stuff
+//
+/obj/item/clothing/head/medievalfake
+	name = "medieval helmet replica"
+	desc = "A plastic replica of knight helmet. Great for tabletop and LARP sessions, not great at stopping melee attacks."
+	icon = 'modular_citadel/icons/obj/clothing/medieval_helmet.dmi'
+	icon_override = 'modular_citadel/icons/mob/medieval_helmet.dmi'
+	icon_state = "knight"
+	item_state = "knight"
+	body_parts_covered = HEAD|FACE|EYES
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
+
+/obj/item/clothing/head/medievalfake/green
+	icon_state = "knight_green"
+	item_state = "knight_green"
+
+/obj/item/clothing/head/medievalfake/blue
+	icon_state = "knight_blue"
+	item_state = "knight_blue"
+
+/obj/item/clothing/head/medievalfake/yellow
+	icon_state = "knight_yellow"
+	item_state = "knight_yellow"
+
+/obj/item/clothing/head/medievalfake/red
+	icon_state = "knight_red"
+	item_state = "knight_red"
+
+// Armours
+/obj/item/clothing/suit/medievalfake
+	name = "plate armour replica"
+	desc = "A plastic replica of knight armor. Great for tabletop and LARP sessions, not great at stopping melee attacks."
+	icon = 'modular_citadel/icons/obj/clothing/medieval_armor.dmi'
+	icon_override = 'modular_citadel/icons/mob/medieval_armor.dmi'
+	icon_state = "knight"
+	item_state = "knight"
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
+
+/obj/item/clothing/suit/medievalfake/green
+	icon_state = "knight_green"
+	item_state = "knight_green"
+
+/obj/item/clothing/suit/medievalfake/yellow
+	icon_state = "knight_yellow"
+	item_state = "knight_yellow"
+
+/obj/item/clothing/suit/medievalfake/blue
+	icon_state = "knight_blue"
+	item_state = "knight_blue"
+
+/obj/item/clothing/suit/medievalfake/red
+	icon_state = "knight_red"
+	item_state = "knight_red"
+
+// Crusader stuff
+// Helmet
+/obj/item/clothing/head/medievalfake/crusader
+	name = "great helm replica"
+	desc = "A plastic replica of classic great helmet."
+	icon_state = "crusader"
+	item_state = "crusader"
+
+/obj/item/clothing/head/medievalfake/crusader/templar
+	name = "templar great helm replica"
+	desc = "Situla Vult!"
+	icon_state = "crusader_templar"
+	item_state = "crusader_templar"
+
+// Armour
+/obj/item/clothing/suit/medievalfake/crusader
+	name = "bland crusader armour replica"
+	desc = "A plastic replica of knight armor with crusader feeling to it. It doesn't have any insignia."
+	icon_state = "crusader"
+	item_state = "crusader"
+
+/obj/item/clothing/suit/medievalfake/crusader/cross
+	name = "crusader armour replica"
+	desc = "A plastic replica of knight armor with crusader feeling to it."
+	icon_state = "crusader_cross"
+	item_state = "crusader_cross"
+
+/obj/item/clothing/suit/medievalfake/crusader/cross/templar
+	name = "templar crusader armour replica"
+	icon_state = "crusader_templar"
+	item_state = "crusader_templar"
+
+/obj/item/clothing/suit/medievalfake/crusader/cross/hospitaller
+	name = "hospitaller crusader armour replica"
+	icon_state = "crusader_hospitaller"
+	item_state = "crusader_hospitaller"
+
+/obj/item/clothing/suit/medievalfake/crusader/dark
+	name = "dark crusader armour replica"
+	desc = "A plastic replica of knight armor with crusader feeling to it. This one is painted dark."
+	icon_state = "crusader_dark"
+	item_state = "crusader_dark"
diff --git a/modular_citadel/icons/mob/medieval_armor.dmi b/modular_citadel/icons/mob/medieval_armor.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..5e386c65bbbd3cc0683d3b700d002432b8ccfdfe
GIT binary patch
literal 3496
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
D@RdQc

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/mob/medieval_helmet.dmi b/modular_citadel/icons/mob/medieval_helmet.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..912683da957529bf6d9cf79aef511badb5fa6a0b
GIT binary patch
literal 1460
zcmV;l1xxygP)<h;3K|Lk000e1NJLTq006)M005u}0{{R3ZT6FI0001oP)t-s0RI4E
zXKH{;M!2}Rd3=6DNK33%P7Q>nE-^C)YK|l(Cm9+WUOzklPjxq5LpP2?MMXtVPfucE
zVsLP9dU|?)e}DbN0E>%@nwpx0g@wG1E#ABy@VWs1*GhA9a{vGU|IQ>~VPW*W0RPDj
zH8nL|U0neG07ytkRaI3+Mn+OnQb|ckKR-WOTpa}f0004WQchC<K<3zH0001@dQ@0+
zL}hbha%pgMX>V=-0C=2@kj)OlAP|Jl@D!xI8~?6eOdHdKeT4>PEJRApLM6VvMUQIa
zHnaI=Cz(?0>qFCu>e%o*$eYoLo!BmxoJFI8p3P>>nTF|gcpD#Nz$}ZaOULeHCls71
zLq0`0yO11^^y-5ps9dxsz~#aZSUbkQ^qD3v6{rgsZdTH-03$@>)VHeaj-216sN3qb
z{S!RcauXHjP$K{U1T9HKK~#90?VH_l;y4h6ku8CO9b(8D2m!nVQv7V*|M|9ML+uTx
zO+_=SshRU7cP*>?NJ=jHNQ1%eg)t^7K8TE)EHa+wxi-S&R*gHEKr7LNxYOnz_T<;&
z&gP@s;snNu0E=hvxfOCaf$QR4$v^DLKh*LMyc<1@9GqVgSYvSlZ{>u^fDstsMz$M)
zGI(c)R?BZBuI!-m{>eUhk4AWzKz?9`u?#Ry76A#6)d?f~80L4G)ABp{8*o^mdnyWF
z6e$0ot<NX|1X+WkKmufL@58A3@iHrl@LQt%WtnAJSwaE+S(ew>XSl<nKz=-ohb<UC
z!%YrzkHZFl3FHKs(%>^B`DKT2ei<QOTZ7|a6O|)62!*?`L4PGO_t;&Bq5Ne}{!+^y
zX7JkgVG-1DKor0o7%TrmyZmKj{s#)|#la)eSO1U6PY5A|5JCtcgb<Q~EQ^Y#_7{d(
zo@c}F$5Z<Y!>)f1E9{FqD*_Vw3)!{5k17oHw<FLo@)N0V674S_1upOL7qYIuZwwO9
zMV$u%ocAyGCE8z@ydVKD6V+cBWMyc;mqh^z%!(q!We`X(Y5j#soWC&9{Dq0;FAU1I
zzaN_PAa1N{`}-j7!{W&*#rX^R4ru<ufBk(V;DP>rQh(t(Y>aoHzrUZ>U%1VXw!a^f
zpAbR_A%qY@2q7d9Y5V(CHJ!b_{`Kv6^8S8R*Ym|v5m47}T0D7w{{aE@n<l`!)%z;`
z{lMz|e*Ar<_xG#yd_Lc7HmJgCD*|doVYs@#Qt$6S)ZaH|bw9qk`3s;uUTvFZ-ZaZs
zRY3iQ;&Ou9{ysdUkM;Mx*5CJ9e_slm&;PEmfL*5m3JCZ2oqm7+k^a8+en9Q-SG&6Y
zsO#kn3fOIf1Qbu+-w!MNp%p0qMyInGu0MHyUle?33;Y0y`}^$*M;AZ{A%qY@2qA<J
z^1t)ivO(cZ7gr`o{C*(x_7;of5-8X#my1PR?<zcf;`akVKxkki0gE<_1*G;DIsxnb
z9tqg**Qx-2kopek-Va=NplSB^!~3RDcffi7X+NX=g~KNj@OjYR58RH>9tqg%N5~yo
zf8h}4FB~*~;h?@B2;Jef0gnVoNCrRwJ}jQBQl!72?tuP&psHFAVT%NW>US~-eg7-G
zA7~}4@5k0{`P$dN#`}Tk6tw7P(`nzgd_O=4A%qY@2qA=!Ka%MC`<;JqMB!tvzYs}P
z*Qc2K`!|09C^+`|3$Z*PK)t_z^B0hSK7S#W>U=t#j>qG-@9(z)&X)@kaJig+u7GXR
zoMP_p-~5Hk{qUv7Ux-EuJe~fDxW9irLKh_9^0SYS<o}Afzkl-=kboY4A)2tlUorRh
zZ~g)j(C05iBMQDE@9(z~&i7;IUVkB)A98;`#$O<W5JCtcgb+f=AH%=diB>0W+HuqX
O0000<MNUMnLSTXwXS|gF

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/clothing/medieval_armor.dmi b/modular_citadel/icons/obj/clothing/medieval_armor.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..dd83b3d2ed5c4cff225d1a3ef6c5b830b2feea0c
GIT binary patch
literal 1529
zcmV<V1qS+wP)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0001@P)t-szrVjj
zNK1Kqez>@}E-^EJOGXE3jtzvS#J{uV;L?hwt#)&3H;zLY8XI0eJkP0}tX56{Pj$SG
zE#ABy*~g$aUPEWSMyZj9vAL(Q$EQU^KO`n6BPAzEOH5*7Vw#$oi;Ih4VPQ^FR?Ek{
z0001ge}7O`TFk|>*44$)(7xH&%H7=1VPj=0EiW)KG*eYqzrVkFdU}I{ga7~kfPjEs
zUthI^KyLs500DGTPE!Ct=GbNc006CeR9JLGWpiV4X>fFDZ*Bkpc$|%q%MOAt5JlJR
zS2VCUzP4@*#ITTGAeD}^p|oVCNc?+Ib|%Kz-FtI#W-+-smzSzm#kG<TKyoptlR9p;
zQq0aIyOhIT3Jb2YX)Tm=f+c2sc#jQ&$)qq2X&HA?+))p(=5O@oC*ZPA@IKC5x<i2Q
z7jAJPZ2+4D!{{|K?R;;Gk%*1+y+&itr){LsCGGw16S*qu;`8+v6KR;=$wKDA000C`
zNkl<ZXo2mRZFkx@5QQaM#u^+`Lg+RPG$w&I?%VE>i2wgz+mSG7Pp$FfARPL^li+aj
z%(bp$IpJD}vBvtFN+x(n<fXWjiA)lF$#BcyJV|9LCBD+2$)UMQut8;6rm!JV1fS%S
zUaqx1kqfCDhYVbY>RR-Cl25$@iWdM-^ztj3%TmqY-TWQQR4F?ho?quvnC90cFBUg&
zvnXhe<2wf-o+hO#XW4u{&t~`zmn*<0Q^;XDA-P^IZWc>T^Y`!%ybtk1N11)V75I>q
z6xWdFIp`j~TrB(e?bXMtTY@W9mIdg!hN3K$>de6LX`Z`pl52n^I0GcVy}Au@+@rD-
z<(-~oGku5e<RAO=z_0NdOefbQze5MmqeuQR%&`L<u2g}yNugHg@U6MCh#j&h3W+>m
zaA58?$r>-y3NO%_*hE8eccVIEB|`u1%{kWEn{@WpAv`!&$nZ}DF4MZZMc#l5CDo@D
z-XW_``0fJSZIhM42DJ)pk>NRZAX5Tg<z+a2VvydUBtA3^%>`Z_{5L6A{&)#4yt`B$
zj+fv<mA}3&!N(eFtg-(7;`0B{!!!B*40Zq8u{%DK?>Rls@9!&jVm#8%4|?)Fqkjdj
zs?CF}r284@;POAGe+A!cWPt}QH`v%6-{*Vq4g&d})3aRoU+ax)kPn@PHs5;#M85CU
z^ISZp@}Zbz8OCGWXpbHJA^#r?grb$#Z(#>Is6TR`xOl`HOmDXtY_&`~4KMj0!ukJ2
zzYFVMI8YoND&0OK(kl70fy@5~z23Rf0e#C469{s2m_qxE2-N3J1Do%i9tYUr03rR6
z1I4jHLgrT>gTOUn^S#r9Hvl31kpsou6cKIb{yytYkj?k4en;q!94PLl_yuqiZb5$u
zOpwj@t$s)8TMiU=Q+(1IZ^NR1aBk?&_Xj<05kk*#H^o|G%h#u;I`{yC%lDj~<3iK`
zU-ec$!M8eu*?iCFSuSvU)LX4<_#SLv^F5<yxo^-yVn?`v%lDj~<F&g>wD_UxnplGV
ze9!6G^Lv9o#lQc#MG9K%&-a|3J-_3=0X>Ed^yhm{&z>Jd`>~@WpJ4Rndrtp~^NaN5
zDicpInBw&8`Tg9)=}#~?eeC(i8f&bvhOfwcA3c0zzK<S1GT+CK-{yD2<a>fgmp`r9
zxB=*V-@~KJ=l9B5YYd(5tNngY@OT55-%W)MDnsUb<a>(88%UKg*7_wN^1azx>%N0L
z-awMt)_^7Qz1<%w$j@Lv+G7#<-nJ_c<k5wh9fx+i&{Fx{@jb=k4Pbt^xCtw3$b64{
zPx0u&?D=f4Fuz+O-y_EzK=3m-P>sPMn&;<+$oKs`z8Y&AQ<-PmG$--s!tK>mI7Mmz
zj-SPV5z>ut5|6FM-DO7nFijJjBFCf4Pte6@Vu~C;gMr5Q0o)u<;PD1Te}3oqIVw8e
f$JUtdFH!#kxgD)PUE`TN00000NkvXXu0mjf1t9><

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/clothing/medieval_helmet.dmi b/modular_citadel/icons/obj/clothing/medieval_helmet.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..94915e87ac0bb4ba22f3c79438621b8c858ba2ab
GIT binary patch
literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30001cP)t-sz`(#`
zXKF)8OL=^LrKYAXF*65hj=YX7-n<?Sgr+xMLpOUvH;zLY8XEvlbwx!*Pft%`Vq$P`
zaC&-rVPRo&b8~-xfB(}yi;Ihznws>z0RPS;|JO?W!~lRxMyys&@VWp1003uaXFEGP
zFfcG)KRiD_KUrB>z`(!_Mt?K_0004WQchC<K<3zH0001+dQ@0+L}hbha%pgMX>V=-
z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi
zl2jm5DLW4&7@uC0nwqD?#hH>>R16e0<l;;#O3Y1#u+bG)rsm}2mlLZxDW^1*ShYo|
zDFl@!7nK$#rlc0dm!#$v<RlgmX*SX3;!>!r;OgfB4r2iJziVo3*=?8r00LJ@L_t(&
zf$f*kc7iYrhHWu8aYE;SIRT|O^!?v(Y3a6`hU|<}Z`R)fUL@vA8uk3FR#8z=50(&8
zh=BEFvc{MEdjm{diZue(f+TPaaB&beLBJmyF!6M*L69PmiI5Zk#O5h^+K>%kgXuP%
zX%MpAGd%AyAX>l%Hdvo-Kw|xEI@92OzX!aC79;@3jlC1`e49eL&FKcSYzMn6BU<1Z
zfZWA%Vg$1SVK1V9Or!*fcOstVHlC;S8O|=5Z6J4XY64qA(mUk8WlY?p7|n#|8(`zS
zm<HH*R8&+{R1~kGD3p3R91gFqfdFMymv41_d=CRK_3Km9A|MQ50(9-%2<-EP5N9&M
z0p`w#eZIhi3z<+<7SI^L!T)jg`2rIzR6^1BeP;np+qT{jxaSL-aG?^4Qfu9HUDM*b
z|BP5?XA&+{LQ(eGAk3}xo{@y%`T-x;fwJ$``Hz(U#~t_Gq~>_^0XTcV8b=JC@ft@z
zpms~fHG2Va7_M*~2HKvZ{~sy;k30AVXaX>A@27;3O1R+!+5$8&!S9xQrV?&<?udS2
z-!b7#B_KdM0KUHv1vvW-Fj5J(ds$T)0cI5xV3CkeR_=&G)Hj5Cc{(-0>LUS%IMuZZ
zRo^0%QsK%+MMXtDK#%eNDzN{@f8((J-vC055FSwd0Q|ORVSQzayGsQa!TNtwTao^M
zDZo_L(=Egq;f~dp{QiGApms|p&Fw;f{s#E{|3Xdv-vCJezYuT_d_<G~w*cDzF9R6=
tZ+-?r{l7b+aQ=S+g!KO^`v0hZs835SI`g2_nxy~$002ovPDHLkV1gQNvw8pk

literal 0
HcmV?d00001

diff --git a/vorestation.dme b/vorestation.dme
index a59a84c1b2b..526cea5afcf 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2931,17 +2931,20 @@
 #include "maps\tether\tether.dm"
 #include "maps\~map_system\maps.dm"
 #include "modular_citadel\code\datums\outfits\jobs\centcom.dm"
-#include "modular_citadel\code\game\objects\items\weapons\storage\donatorbackpack.dm"
+#include "modular_citadel\code\datums\supplypacks\contraband_cit.dm"
+#include "modular_citadel\code\datums\supplypacks\costumes_cit.dm"
 #include "modular_citadel\code\datums\supplypacks\misc_vr.dm"
+#include "modular_citadel\code\game\objects\items\weapons\storage\donatorbackpack.dm"
 #include "modular_citadel\code\modules\admin\chat_commands.dm"
-#include "modular_citadel\code\modules\clothing\under\accessories\holster.dm"
 #include "modular_citadel\code\modules\client\preference_setup\loadout.dm"
 #include "modular_citadel\code\modules\client\preference_setup\loadout_donator.dm"
 #include "modular_citadel\code\modules\clothing\donatorclothing.dm"
 #include "modular_citadel\code\modules\clothing\suits\donatorarmor.dm"
 #include "modular_citadel\code\modules\clothing\suits\donatorlabcoat.dm"
+#include "modular_citadel\code\modules\clothing\suits\medieval_armor.dm"
 #include "modular_citadel\code\modules\clothing\under\donatoruniform.dm"
 #include "modular_citadel\code\modules\clothing\under\accessories\donatoraccessory.dm"
+#include "modular_citadel\code\modules\clothing\under\accessories\holster.dm"
 #include "modular_citadel\code\modules\mob\living\simple_animal\simple_animal_vr.dm"
 #include "modular_citadel\code\modules\vore\eating\living_vr.dm"
 // END_INCLUDE