diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 3115be40a8a..db690c995eb 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -310,6 +310,7 @@ pmc_labcoats["PMCG labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt pmc_labcoats["PMCG labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/pmc pmc_labcoats["EPMC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc + pmc_labcoats["Nexus longcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/nexus pmc_labcoats["PMCG corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/pmc pmc_labcoats["EPMC corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/pmc/alt pmc_labcoats["PMCG winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/pmc @@ -378,6 +379,7 @@ 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 + pmcg_sec_uniforms["Nexus Corporate uniform"] = /obj/item/clothing/under/rank/security/pmc/nexus gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms) gear_tweaks += list(gear_tweak_uniform_rolled_state) @@ -407,6 +409,13 @@ faction = "Private Military Contracting Group" allowed_roles = list("Physician", "Medical Personnel") +/datum/gear/faction/epmc_uniform_phys_med/New() + ..() + 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 + gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_phys_med) + /datum/gear/faction/epmc_uniform_pharm_med display_name = "PMCG pharmacist uniform" path = /obj/item/clothing/under/rank/medical/pharmacist/pmc/alt @@ -414,6 +423,13 @@ faction = "Private Military Contracting Group" allowed_roles = list("Pharmacist", "Medical Personnel") +/datum/gear/faction/epmc_uniform_pharm_med/New() + ..() + var/list/epmc_uniform_pharm_med = list() + epmc_uniform_pharm_med["PMCG pharmacist uniform"] = /obj/item/clothing/under/rank/medical/pharmacist/pmc/alt + epmc_uniform_pharm_med["Nexus Corporate Security medic uniform"] = /obj/item/clothing/under/rank/medical/pmc/nexus + gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_pharm_med) + /datum/gear/faction/epmc_uniform_psych_med display_name = "PMCG psychiatrist uniform" path = /obj/item/clothing/under/rank/medical/psych/pmc/alt @@ -421,6 +437,13 @@ faction = "Private Military Contracting Group" allowed_roles = list("Psychiatrist", "Medical Personnel") +/datum/gear/faction/epmc_uniform_psych_med/New() + ..() + var/list/epmc_uniform_psych_med = list() + epmc_uniform_psych_med["PMCG psychiatrist uniform"] = /obj/item/clothing/under/rank/medical/psych/pmc/alt + epmc_uniform_psych_med["Nexus Corporate Security medic uniform"] = /obj/item/clothing/under/rank/medical/pmc/nexus + gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_psych_med) + /datum/gear/faction/epmc_uniform_intern_med display_name = "PMCG medical intern uniform" path = /obj/item/clothing/under/rank/medical/intern/pmc/alt @@ -442,6 +465,7 @@ epmc_uniform_para_med["PMCG paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt epmc_uniform_para_med["Sekhmet Intergalactic paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh epmc_uniform_para_med["Ve'katak Phalanx paramedic 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 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 4cd49824c46..c734f800b85 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -110,3 +110,23 @@ icon_state = "amapola_ftg" item_state = "amapola_ftg" contained_sprite = TRUE + +/obj/item/clothing/under/rank/security/pmc/nexus + name = "Nexus Corporate Security uniform" + desc= "A uniform used by employees of Nexus Corporate Security, a subsidiary of NanoTrasen. Despite being technically a separate entity, Nexus's security uniforms still bare resemblance to its parent company's now largely defunct security division." + icon_state = "nexus_officer" + item_state = "nexus_officer" + +/obj/item/clothing/under/rank/medical/paramedic/pmc/nexus + name = "Nexus Corporate Security paramedic uniform" + desc= "A uniform used by employees of Nexus Corporate Security, a subsidiary of NanoTrasen. The predominantly black colour identifies the wearer as a member of Nexus's medical division, with the leg cuffs further specifying them being a paramedic." + desc_extended = "More rugged than traditional medical attire, Nexus's uniforms are designed to be comfortable in every environment, be it the sterile hallways of a Mendell clinic or the battered roads of Mictlan." + icon_state = "nexus_emt" + item_state = "nexus_emt" + +/obj/item/clothing/under/rank/medical/pmc/nexus + name = "Nexus Corporate Security medic uniform" + desc= "A uniform used by employees of Nexus Corporate Security, a subsidiary of NanoTrasen. The predominantly black colour identifies the wearer as a member of Nexus's medical division." + desc_extended = "More rugged than traditional medical attire, Nexus's uniforms are designed to be comfortable in every environment, be it the sterile hallways of a Mendell clinic or the battered roads of Mictlan." + icon_state = "nexus_med" + item_state = "nexus_med" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 269971c8919..cd3d23e7f38 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -134,6 +134,12 @@ icon_state = "labcoat_long_pmc" item_state = "labcoat_long_pmc" +//Nexus +/obj/item/clothing/suit/storage/toggle/labcoat/nexus + name = "nexus longcoat" + desc = "A hybridization between a traditional labcoat and an EMT jacket, designed to be worn in lab environments while still being comfortable in the field. The iconic Nexus whirlwind is emblazoned on the back." + icon_state = "labcoat_nexus" + //Idris /obj/item/clothing/suit/storage/toggle/labcoat/idris name = "idris labcoat" diff --git a/html/changelogs/CometBlaze-nexus_drip.yml b/html/changelogs/CometBlaze-nexus_drip.yml new file mode 100644 index 00000000000..497b8b2dcbe --- /dev/null +++ b/html/changelogs/CometBlaze-nexus_drip.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: CometBlaze + +# 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: + - imageadd : "Added dedicated uniforms for Nexus Corporate Security." diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index 5d35500a758..3beb4938343 100644 Binary files a/icons/obj/item/clothing/department_uniforms/medical.dmi and b/icons/obj/item/clothing/department_uniforms/medical.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/security.dmi b/icons/obj/item/clothing/department_uniforms/security.dmi index da77478b2c6..ef969b20a0b 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ diff --git a/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi b/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi index c58c2f959c6..fefe6dd8d50 100644 Binary files a/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi and b/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi differ