diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index ae7171d3632..2ae8bb0e8f2 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -1,7 +1,7 @@ /datum/outfit/admin/ert/ap_eridani name = "Eridani Asset Protection Specialist" - uniform = /obj/item/clothing/under/rank/security/pmc + uniform = /obj/item/clothing/under/rank/security/pmc/epmc accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/projectile/automatic/x9 = 1) suit = /obj/item/clothing/suit/space/void/cruiser @@ -59,9 +59,9 @@ /datum/outfit/admin/ert/ap_eridani/lead name = "Eridani Section Leader" - uniform = /obj/item/clothing/under/rank/warden/pmc + uniform = /obj/item/clothing/under/rank/security/pmc/epmc_alt suit = null - head = /obj/item/clothing/head/beret/corporate/pmc + head = /obj/item/clothing/head/beret/corporate/pmc/epmc mask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba back = /obj/item/rig/strike/distress suit_store = null @@ -85,10 +85,10 @@ /datum/outfit/admin/ert/ap_eridani/doctor name = "Eridani Medical Officer" - uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc + uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc suit = /obj/item/clothing/suit/storage/medical_chest_rig suit_store = /obj/item/clothing/head/hardhat/first_responder - head = /obj/item/clothing/head/beret/corporate/pmc + head = /obj/item/clothing/head/beret/corporate/pmc/epmc mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator shoes = /obj/item/clothing/shoes/swat/ert @@ -129,10 +129,10 @@ /datum/outfit/admin/ert/ap_eridani/corpsman name = "Eridani Corpsman" - uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc + uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc suit = /obj/item/clothing/suit/storage/medical_chest_rig suit_store = /obj/item/clothing/head/hardhat/first_responder - head = /obj/item/clothing/head/softcap/pmc + head = /obj/item/clothing/head/softcap/pmc/epmc mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator gloves = /obj/item/clothing/gloves/latex/nitrile diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 7db3e5d218d..4bbd7aaf59e 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -521,7 +521,7 @@ var/const/NO_EMAG_ACT = -50 ..() /obj/item/card/id/distress/ap_eridani - name = "\improper Eridani identification card" + name = "\improper Eridani Private Military Contractor ID" desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Eridani Corporate Federation." assignment = "EPMC Asset Protection" icon_state = "pmc_card" diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 2b3e8b5e9e6..abde9cc0ba7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -110,6 +110,7 @@ zavod_sunglasses["aviator sunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod gear_tweaks += new /datum/gear_tweak/path(zavod_sunglasses) +// PMCG /datum/gear/faction/pmc_beret display_name = "PMCG beret" path = /obj/item/clothing/head/beret/corporate/pmc @@ -152,6 +153,57 @@ pmc_labcoats["labcoat alt, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats) +/datum/gear/faction/pmc_patch + display_name = "PMCG armband" + path = /obj/item/clothing/accessory/armband/pmc + slot = slot_tie + faction = "Private Military Contracting Group" + +// Eridani Private Military Contractors +/datum/gear/faction/epmc_headwear + display_name = "EPMC headwear selection" + description = "A selection of EPMC headwear." + path = /obj/item/clothing/head/softcap/pmc/epmc + slot = slot_head + faction = "Private Military Contracting Group" + +/datum/gear/faction/epmc_headwear/New() + ..() + var/list/epmc_headwear = list() + epmc_headwear["beret, EPMC"] = /obj/item/clothing/head/beret/corporate/pmc/epmc + epmc_headwear["softcap, EPMC"] = /obj/item/clothing/head/softcap/pmc/epmc + gear_tweaks += new /datum/gear_tweak/path(epmc_headwear) + +/datum/gear/faction/epmc_sec_uniforms + display_name = "EPMC security uniform selection" + description = "A selection of EPMC security uniforms." + path = /obj/item/clothing/under/rank/security/pmc/epmc + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden") + +/datum/gear/faction/epmc_sec_uniforms/New() + ..() + var/list/epmc_sec_uniforms = list() + epmc_sec_uniforms["white, EPMC"] = /obj/item/clothing/under/rank/security/pmc/epmc + epmc_sec_uniforms["black, EPMC"] = /obj/item/clothing/under/rank/security/pmc/epmc_alt + gear_tweaks += new /datum/gear_tweak/path(epmc_sec_uniforms) + +/datum/gear/faction/erisec_patch + display_name = "EPMC sleeve patch" + path = /obj/item/clothing/accessory/sleevepatch/erisec + slot = slot_tie + faction = "Private Military Contracting Group" + allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden") + +/datum/gear/faction/epmc_uniform_fr_med + display_name = "EPMC first responder uniform" + description = "EPMC first responder uniform." + path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("First Responder") + /datum/gear/faction/zenghu_beret display_name = "Zeng-Hu beret selection" description = "A selection of Zeng-Hu berets." @@ -211,12 +263,6 @@ faction = "Zavodskoi Interstellar" allowed_roles = list("Security Officer","Investigator","Warden") -/datum/gear/faction/erisec_patch - display_name = "PMCG sleeve patch" - path = /obj/item/clothing/accessory/sleevepatch/erisec - slot = slot_tie - faction = "Private Military Contracting Group" - /datum/gear/faction/idrissec_patch display_name = "idris security sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/idrissec diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 28ba6da57e6..ceea0e280b7 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -150,6 +150,12 @@ icon_state = "pmc" item_state = "pmc" +/obj/item/clothing/head/beret/corporate/pmc/epmc + name = "epmc beret" + desc = "A beret with the Eridani Private Military Contractor logo emblazoned on it." + icon_state = "epmc" + item_state = "epmc" + /obj/item/clothing/head/beret/corporate/idris name = "idris beret" desc = "A beret with the Idris Incorporated insignia emblazoned on it." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 9fbc52e6305..2530ce2f90e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -139,6 +139,12 @@ icon_state = "pmcalt" item_state = "pmcalt" +/obj/item/clothing/head/softcap/pmc/epmc + name = "epmc cap" + desc = "A grey EPMC fatigue cap with the logo of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection." + icon_state = "epmc" + item_state = "epmc" + /obj/item/clothing/head/softcap/zavod name = "zavodskoi cap" desc = "A company-issue Zavokdskoi cap with the symbol of the corporation at its front. It seems to be immaculately starched; maybe it's just the material it's made out of." diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index eb936ae6107..90d4a6d5e35 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -801,7 +801,7 @@ overlay_state = "necrosec_patch" /obj/item/clothing/accessory/sleevepatch/erisec - name = "\improper PMCG sleeve patch" + name = "\improper EPMC sleeve patch" desc = "A digital patch which can be attached to the shoulder sleeve of clothing. This one denotes the wearer as an Eridani Private Military Contractor." icon_state = "erisec_patch" overlay_state = "erisec_patch" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 3cbd6cbe433..2337bb5523e 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -64,10 +64,16 @@ /obj/item/clothing/accessory/armband/idris name = "\improper Idris Incorporated armband" - desc = "A armband, worn by contractors to denote which company they're from. This one shows the Idris Incorporated logo displayed on a cyan background." + desc = "An armband, worn by contractors to denote which company they're from. This one shows the Idris Incorporated logo displayed on a cyan background." icon_state = "idris_armband" overlay_state = "idris_armband" +/obj/item/clothing/accessory/armband/pmc + name = "\improper PMCG armband" + desc = "An armband, worn by contractors to denote which company they're from. This one bears the Private Military Contractor Group logo." + icon_state = "pmc_armband" + overlay_state = "pmc_armband" + /obj/item/clothing/accessory/armband/colourable name = "armband" desc = "An armband in 16,777,216 designer colors." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index dad189771f2..803861aebdc 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -177,6 +177,10 @@ icon_state = "pmc_emt" item_state = "pmc_emt" +/obj/item/clothing/under/rank/medical/first_responder/pmc/epmc // Note: Item Icon placeholder + icon_state = "epmc_emt" + item_state = "epmc_emt" + // Surgeon /obj/item/clothing/under/rank/medical/surgeon name = "surgeon's scrubs" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index e2e013e729c..9fc52714289 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -33,6 +33,14 @@ icon_state = "pmc_officer" item_state = "pmc_officer" +/obj/item/clothing/under/rank/security/pmc/epmc // Note: Item Icon placeholder + icon_state = "epmc_officer" + item_state = "epmc_officer" + +/obj/item/clothing/under/rank/security/pmc/epmc_alt // Note: Item Icon placeholder + icon_state = "epmc_officer_alt" + item_state = "epmc_officer_alt" + /obj/item/clothing/under/rank/cadet name = "security cadet's uniform" desc = "It's made of a slightly sturdier material, to allow for robust protection." diff --git a/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm index b80743a487d..01d0e5b0f59 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm @@ -14,7 +14,7 @@ short_name = "eridanileader" mob_name_prefix = "Ldr. " max_count = 1 - desc = "The leader of the PMCG Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly." + desc = "The leader of the EPMC Asset Protection Team. Ensure your employers bottom line remains protected and don't sign blindly." outfit = /datum/outfit/admin/ert/ap_eridani/lead possible_species = list(SPECIES_HUMAN) @@ -23,7 +23,7 @@ short_name = "eridanidoctor" mob_name_prefix = "Dr. " max_count = 1 - desc = "A highly trained Eridani medical officer and the second in command of the PMCG Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run." + desc = "A highly trained Eridani medical officer and the second in command of the EPMC Asset Protection Team. Well versed in surgical procedures and expected to work in a hot zone. Not a stranger to a bank run." outfit = /datum/outfit/admin/ert/ap_eridani/doctor possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_SHELL) diff --git a/html/changelogs/EPMC_items.yml b/html/changelogs/EPMC_items.yml new file mode 100644 index 00000000000..c501880e88c --- /dev/null +++ b/html/changelogs/EPMC_items.yml @@ -0,0 +1,9 @@ +author: stev/Memescope, Vrow + +delete-after: True + +changes: + - rscadd: "Added back in the Eridani Private Military Corporation uniforms, headwear and renamed the Eridani Sec Sleeve Patch appropriately to an Eridani item instead of PMCG. All which should be available in the loadout!" + - rscadd: "Added the PMCG Armband, which was made fully by Memescope (who also reworked the current PMCG sprites to the nifty, clean and organized state as they currently are)" + - bugfix: "Fixed EPMC AP's IDs being invisible, also using the incorrect PMCG uniforms instead of their proper ERT" + - bugfix: "Properly names PMCG items as PMCG instead of just PMC." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index ac15c9f3fac..328ea185b90 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 05490667175..dcafd097b73 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index 71952604988..6fb467522af 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index d371567fd34..92c1e96251c 100644 Binary files a/icons/obj/clothing/hats/soft_caps.dmi and b/icons/obj/clothing/hats/soft_caps.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index ef058405204..5313938a39a 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/medical.dmi b/icons/obj/contained_items/department_uniforms/medical.dmi index 9417ed26241..aff537595d1 100644 Binary files a/icons/obj/contained_items/department_uniforms/medical.dmi and b/icons/obj/contained_items/department_uniforms/medical.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi index 3d978022de6..0840eabb325 100644 Binary files a/icons/obj/contained_items/department_uniforms/security.dmi and b/icons/obj/contained_items/department_uniforms/security.dmi differ