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 00000000000..f532ead8bc0 Binary files /dev/null and b/icons/clothing/head/pmcg.dmi differ diff --git a/icons/clothing/under/uniforms/pmcg.dmi b/icons/clothing/under/uniforms/pmcg.dmi index df6627a602e..83502f783d7 100644 Binary files a/icons/clothing/under/uniforms/pmcg.dmi and b/icons/clothing/under/uniforms/pmcg.dmi differ