From a2f13efbcffb7623d0ffa594e6ee70e9ae079f92 Mon Sep 17 00:00:00 2001
From: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:34:51 -0600
Subject: [PATCH] Adds Grupo Amapola Uniforms (#19391)

* Adds uniforms and hats for the Grupo Amapola.
* Sprites made by me (Lavillastrangiato), recoloured/modified from the
Sol army uniforms.

To-do:
- [x] Make the rolled sleeves and the rolled-down suit sprites show up
- [x] Figure out why the hats aren't showing in the loadout

---------

Co-authored-by: La Villa Strangiato <mangodeity@gmail.com~>
Co-authored-by: Llywelwyn <lewiiswynne@gmail.com>
---
 .../loadout/items/factions.dm                 |  10 +++
 code/modules/clothing/factions/pmcg.dm        |   9 +++
 code/modules/clothing/head/misc.dm            |  14 +++++
 .../Lavillastrangiato - amapola.yml           |  58 ++++++++++++++++++
 icons/clothing/head/pmcg.dmi                  | Bin 0 -> 795 bytes
 icons/clothing/under/uniforms/pmcg.dmi        | Bin 1488 -> 2552 bytes
 6 files changed, 91 insertions(+)
 create mode 100644 html/changelogs/Lavillastrangiato - amapola.yml
 create mode 100644 icons/clothing/head/pmcg.dmi

diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm
index 262d35ba5d4..02af2d1236a 100644
--- a/code/modules/client/preference_setup/loadout/items/factions.dm
+++ b/code/modules/client/preference_setup/loadout/items/factions.dm
@@ -347,6 +347,7 @@
 	pmcg_headwear["PMCG woolen hat"] = /obj/item/clothing/head/wool/pmc
 	pmcg_headwear["EPMC woolen hat"] = /obj/item/clothing/head/wool/pmc/alt
 	pmcg_headwear["PMCG garrison cap"] = /obj/item/clothing/head/sidecap/pmcg
+	pmcg_headwear["Grupo Amapola utility cover"] = /obj/item/clothing/head/grupo_amapola/ute
 	gear_tweaks += new /datum/gear_tweak/path(pmcg_headwear)
 
 /datum/gear/faction/pmc_modsuit
@@ -375,6 +376,7 @@
 	pmcg_sec_uniforms["wildlands squadron uniform"] = /obj/item/clothing/under/rank/security/pmc/wildlands_squadron
 	pmcg_sec_uniforms["Dagamuir Freewater uniform"] = /obj/item/clothing/under/rank/security/pmc/dagamuir_freewater
 	pmcg_sec_uniforms["Ve'katak Phalanx uniform"] = /obj/item/clothing/under/rank/security/pmc/vekatak_phalanx
+	pmcg_sec_uniforms["Grupo Amapola uniform"] = /obj/item/clothing/under/rank/security/pmc/grupo_amapola
 	gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms)
 	gear_tweaks += list(gear_tweak_uniform_rolled_state)
 
@@ -474,6 +476,14 @@
 	faction = "Private Military Contracting Group"
 	slot = slot_w_uniform
 
+/datum/gear/faction/grupo_amapola_officer
+	display_name = "grupo amapola officer cap"
+	path = /obj/item/clothing/head/grupo_amapola
+	flags = GEAR_HAS_DESC_SELECTION
+	allowed_roles = list("Head of Security")
+	faction = "Private Military Contracting Group"
+	slot = slot_head
+
 //Zeng-Hu
 /datum/gear/faction/zenghu_beret
 	display_name = "zeng-hu headwear selection"
diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm
index 330ff572476..dcc259a23e4 100644
--- a/code/modules/clothing/factions/pmcg.dm
+++ b/code/modules/clothing/factions/pmcg.dm
@@ -101,3 +101,12 @@
 	desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has green shoulder stripes, identifying it as belonging to a Phalanx member that is not presently serving in an active combat role."
 	icon_state = "phalanx-res_jumpsuit"
 	item_state = "phalanx-res_jumpsuit"
+
+/obj/item/clothing/under/rank/security/pmc/grupo_amapola
+	name = "Grupo Amapola uniform"
+	desc = "A uniform used by the forces of the Grupo Amapola, a private military company originating out of Mictlan. It is based off the old uniforms of the Mictlan Defense Force, a once-Solarian planetary guard, with red poppy patches on the back and right arm."
+	desc_extended = "The Grupo Amapola's light green camo is taken from old uniforms of the Mictlan Defense Force, the same uniforms used by the insurgents known as the Samaritans. Many MDF service personnel defected to the Samaritans, and after the fighting between the Tau Ceti Armed Forces and Samaritans ended, the less scrupulous among their number now work for Grupo Amapola."
+	icon = 'icons/clothing/under/uniforms/pmcg.dmi'
+	icon_state = "amapola_ftg"
+	item_state = "amapola_ftg"
+	contained_sprite = TRUE
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 526706b999f..212c0595f08 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -711,3 +711,17 @@
 	desc = "A garrison cap belonging to a high-ranking officer of the All-Xanu Spacefleet."
 	icon_state = "xanu_garrison_cap"
 	item_state = "xanu_garrison_cap"
+
+/obj/item/clothing/head/grupo_amapola
+	name = "Grupo Amapola officer cap"
+	desc = "A peaked officer's cap bearing the poppy of the military contracting group Grupo Amapola."
+	icon = 'icons/clothing/head/pmcg.dmi'
+	icon_state = "amapola_officer_hat"
+	item_state = "amapola_officer_hat"
+	contained_sprite = TRUE
+
+/obj/item/clothing/head/grupo_amapola/ute
+	name = "Grupo Amapola utility cover"
+	desc = "A softcap in green camo, issued to members of the military contracting group Grupo Amapola."
+	icon_state = "amapola_ute_hat"
+	item_state = "amapola_ute_hat"
diff --git a/html/changelogs/Lavillastrangiato - amapola.yml b/html/changelogs/Lavillastrangiato - amapola.yml
new file mode 100644
index 00000000000..4290e7a4186
--- /dev/null
+++ b/html/changelogs/Lavillastrangiato - amapola.yml	
@@ -0,0 +1,58 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Lavillastrangiato
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds Grupo Amapola uniforms and hats."
diff --git a/icons/clothing/head/pmcg.dmi b/icons/clothing/head/pmcg.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..f532ead8bc05c621413679a531b46d67a9712f89
GIT binary patch
literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0001EP)t-sz`(#V
zHXk!MCu(y+j4cfs8X971JXaPJxriy)qdoA!XATYyF)=YOFE3+jJ#u?Sc7I4nPAnrP
z79=1bCnY6STr^Z$G<ShXlb>2(XghCsL|tS#W^O(^J3E}HWi>G|z`(#Hb=Y+P0004W
zQchC<K<3zH0001sdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>
zRWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DKR&(AU`KDK0hrjGdZ;=J|nS2
ziHkEOv#1y-Yskf!R+N~V3Sr~Z6Q7Za&}M>PTWLuuN!CEs<FP_n!PU<N?0o>~#!vG*
z^VO#S00GZQL_t(&f$f^XZt5@)MU5eow8V}Fu*Ydj`TxIs<3RORcGaZqsL~uMY_8>d
zFpDrzjQI+?LL;|@_7<P7X!Y+8-C<uhu=_$||I*HTtnUZt0jdU;bEa-!EwCW;s|AMP
z>G^3GssfL^DliO>6)Odf<DFwQ?>OzMxj8O4H;!u!?$qP1P+#zWla&IB^3&K4r2737
zrUPFfV_*@c>CpAl1Sn!)kqtu62Y_M%2oQk#WdzKr+$o;Rz2YR&Z`}Ff3YW8!5iqC4
z;Bpo^fQNx(KN}PT`xQk|6mbOqklx|pf15)rY{>g%d|z#VF_EVfab<2E!~5#-9g#u|
zgtda*jsga%KI9ok=i2l4rv^TT=&N6lbN;C3+Xr`C9%3~F%7W?vDSrU*={coD88QhO
z*hEASLI4>9YiA$;zKF7j0KrU|1O*^x7FY~sndb-L1wu?Yzs^ZWAeLKAdV?2{es^^t
zrT2NxLjBHNukMbJz(@T}qTZO>)!iifm*1cuRj(+DqWmJw0lq!me*+j}XiT>}-iBBo
z?>7_CqvsL6ArOd{;7=XH&X;-&^%W&0?^~~tYyy#ggIIk}g#(UJ2Yf|Q6h%=KMNyRR
Z<sS-=8(IYe+7JK$002ovPDHLkV1m~SRUQBU

literal 0
HcmV?d00001

diff --git a/icons/clothing/under/uniforms/pmcg.dmi b/icons/clothing/under/uniforms/pmcg.dmi
index df6627a602e18ac975154198945963f978a26e81..83502f783d71069f8bca578ebb87a68472b2c855 100644
GIT binary patch
delta 2504
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
CfAcE<

delta 1431
zcmaJ>dpOez82+t1lxsa?qRv*5DTQZsM48)!+|8}y7P?7unTh7|TNFZcaU%C5jyjp_
zxI~N;kqn)*h`BGfMm94)`|Ygf^yhib^L*d;KJWYe_r34)ttt1(Y29>ov{sN+mjwVo
z!PW-vD#2Dsmu%TAnZ(t5VG^*rqh$}awzei63e=WR1liS*0GQ3N&Pzxx#m$S1KNlH9
z3Jxa+hlK(_OaZ|ooD?PC5yF@GQwQu09q8?05~|(x`>|sax=eeWE`XGAtKk^d75f2u
z3SBU9_w`*jG@%l$X`pRDv#7_^qH#};)R#0Iq2q6+W3}jis9}h2!8Z>)vUBrg113MJ
z_~)hcU9d=O*;^A;e!HBWyGu#+-fUZ7jft0ifz0nad_+F2E{Z_(u7`T0g9()YAeCi{
zH+PFESj->4Qihhl;S%0gIZ~Hd!xfj?^*L5}Tl}f>o@~ethJwQO;qgqrRy8XZ6)Tr-
zN#(W6G-7^xBYn^qbTcdu@qVIA9NztnUAg#D;2Ya*z0gPe`%t;Y2SW$;Z|Q>3A=SW4
zKFzeSv2K2XJDVL6n4^fMq<uAceMXd$9-rmoIE`8-d?*Z3=2RK++s#Ge<A{C&GH<j)
z?Iktl`C`7M2z!Ov!Cc%qq=r+(K5lY1r8U0ehb=(;<{IEd#B!jF%g$Tfs961>s#^%+
zh0ZKtAy@%1G#AQ?4NY>|6qBO*r2Wi>jZ(XBPQ%Z(b||XRr;TDCdFSYiowSx+${IA6
z_W*nr7J^m-OTiGTMskFjPaO~zMusA!bie9b9`B>m)aCR}qlR0Jw`mBL_IJo)cwq`^
z&C#Qez#Rh=p`z$iA&;eyyyyGm(WMpPBtf-!aZOj#iFJ4c$<tn=S5Pa0gzqnUR_~da
zo9&ozdYhk|0eozUSnkhMs<h(jKZ{*!<8g9o6?lq`waYo2AffGm6lrZ=8F}SkOEa!l
zJbajvY9>t$E#A8yHIm9ktf?NG(x|q|z*E4!WusG5+7bHV32Y+H;(F2f@L<4I`4{kY
z*Xq{G>v={z6Z=`6(h^q$8Is!A4&1?%EZsksMO~RyRFTEZSAu5|F~A7UoZ^5Soy=}I
znJtGlRd$n0E5%5vTj_Bf!#{rrP9R=_pxVksu4jcrD2|2`eof?X!OhuCpuE@-g1k$l
z!eCsfMz}NvWN%S*{>-L15<!OX0E|1%_=~~p)m!A!SL`5YVdFm~7&+xBNtUGG)8#}l
zO!o5sgwk(bU2i9UUgi3KH(@=b%`2sb_MC9Q*1~{6@xofje9pT%Pz;i~jy|_@npe7N
zV%5W2Z_n^`tnSGP9%h*O&P<mS4Weo&2hQZp@>8xFdr*C6=3&v*t^z$Yxqgo0&V*?O
zJ&`4!Q0O@uM8^%u?zV}4_)|_V^7{O`rCA+E?_Ci;MJqCPHNcWY+e~R0d!osatD=m@
znPX_C*Ix-YH3DG0Zop|-j+|dquP~7%J$Q{3GaHBSHM4;Pbj@m~PU~$pMVBzcf^qd2
z0674QdgNI&D6#1Nj#U+EmFYG(fwd8PIrW8cv?w5pA<kbC=rqr*Cq3MVPdjpLH*Tv=
zVG|6fh~m?7Pc%65#7UMd2yZ+lTZZbl;NQ=#7;6HV0nByF=N2RcwZV%Q*QV|qlkQ?u
ztjF4POlIF%CbA63MCir0nEkk|ij}bIOB2H>f(zr`G((U|G?z>G!eBVLtcv~l*e75T
z!^!+bXIW^8eK*^XU&qPW5WBM@Td3a!4sSMn8(~-676=~LK+u<s2^eR{Xpk5i{6Efa
zZ2TLepJCd*1_^Em6GhOgxHdRG;0GJ$vXRLQ&|eMyDfEk=ZgD3{rPRyQcP=zr@<;(&
MD@S~l#hJu^0Gt@`vj6}9