diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index aacd93caefb..c0807fab57d 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -526,8 +526,9 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co ..() var/list/epmc_uniform_phys_med = list() epmc_uniform_phys_med["PMCG physician uniform"] = /obj/item/clothing/under/rank/medical/pmc/alt - epmc_uniform_phys_med["Nexus Corporate Security medic uniform"] = /obj/item/clothing/under/rank/medical/pmc/nexus epmc_uniform_phys_med["Ve'katak Phalanx medical uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx + epmc_uniform_phys_med["Nexus Corporate Security medic uniform"] = /obj/item/clothing/under/rank/medical/pmc/nexus + epmc_uniform_phys_med["Grupo Amapola uniform"] = /obj/item/clothing/under/rank/medical/pmc/grupo_amapola gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_phys_med) /datum/gear/faction/epmc_uniform_pharm_med @@ -596,6 +597,7 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co epmc_uniform_para_med["Sekhmet Intergalactic paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh epmc_uniform_para_med["Ve'katak Phalanx medical uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx epmc_uniform_para_med["Nexus Corporate Security paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/nexus + epmc_uniform_para_med["Grupo Amapola uniform"] = /obj/item/clothing/under/rank/medical/pmc/grupo_amapola gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_para_med) /datum/gear/faction/wildlands_flagpatches diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index 9bd2bc3a88f..b3d8b9d952c 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -120,7 +120,7 @@ /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 = "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 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/obj/item/clothing/department_uniforms/security.dmi' icon_state = "amapola_ftg" @@ -164,6 +164,15 @@ item_state = "kog_medical" contained_sprite = TRUE +/obj/item/clothing/under/rank/medical/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 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/obj/item/clothing/department_uniforms/medical.dmi' + icon_state = "amapola_ftg" + item_state = "amapola_ftg" + contained_sprite = TRUE + /obj/item/clothing/suit/storage/toggle/armor/kog/ icon = 'icons/obj/item/clothing/department_uniforms/security.dmi' contained_sprite = TRUE diff --git a/html/changelogs/wezzy-grupo-amapola.yml b/html/changelogs/wezzy-grupo-amapola.yml new file mode 100644 index 00000000000..50e1e9466d0 --- /dev/null +++ b/html/changelogs/wezzy-grupo-amapola.yml @@ -0,0 +1,59 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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 to the medical selections." + - bugfix: "Fixes Grupo Amapola description." diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index 29f5ee5a282..64f51a552a1 100644 Binary files a/icons/obj/item/clothing/department_uniforms/medical.dmi and b/icons/obj/item/clothing/department_uniforms/medical.dmi differ