diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index ffe1be3fd66..adbb0d9120c 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -12,6 +12,24 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/white uniform = /obj/item/clothing/under/plasmaman/enviroslacks +/datum/outfit/plasmaman/syndicate_officer + name = "Syndicate Officer Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/syndicate + uniform = /obj/item/clothing/under/plasmaman/syndicate + +/datum/outfit/plasmaman/specops_officer + name = "Centcomm Officer Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/centcomm + uniform = /obj/item/clothing/under/plasmaman/centcomm + +/datum/outfit/plasmaman/nt_rep + name = "NanoTrasen Representative Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/nt_rep + uniform = /obj/item/clothing/under/plasmaman/nt + /datum/outfit/plasmaman/nt name = "NanoTrasen Plasmaman" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f4298bd5235..2f5baf9d3b7 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -917,7 +917,8 @@ BLIND // can't see anything "Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi', "Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi', "Neara" = 'icons/mob/clothing/species/monkey/neck.dmi', - "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi' + "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/neck.dmi' ) /obj/item/clothing/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 991b84edff2..8b16d87baa9 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -291,6 +291,14 @@ HUDType = DATA_HUD_SECURITY_ADVANCED examine_extensions = list(EXAMINE_HUD_SECURITY_READ) +/obj/item/clothing/head/helmet/space/plasmaman/nt_rep + name = "nanotrasen representative envirosuit helmet" + desc = "An envirohelm designed for plasmamen NT representatives." + icon_state = "ntrep_envirohelm" + item_state = "ntrep_envirohelm" + HUDType = DATA_HUD_SECURITY_BASIC + examine_extensions = list(EXAMINE_HUD_SKILLS) + /obj/item/clothing/head/helmet/space/plasmaman/chef name = "chef plasma envirosuit helmet" desc = "An envirohelm designed for plasmamen chefs." @@ -371,3 +379,20 @@ armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 100) resistance_flags = FIRE_PROOF | ACID_PROOF magical = TRUE + +/obj/item/clothing/head/helmet/space/plasmaman/syndicate + name = "syndicate officer envirosuit helmet" + desc = "Tactical plasmaman envirohelm designed for Syndicate officers." + icon_state = "syndicatecentcomm_envirohelm" + item_state = "syndicatecentcomm_envirohelm" + vision_flags = SEE_MOBS + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE + + +/obj/item/clothing/head/helmet/space/plasmaman/centcomm + name = "Central command officer envirosuit helmet" + desc = "Central command plasmaman envirohelm designed specially for Nanotrasen officers." + icon_state = "centcomm_envirohelm" + item_state = "centcomm_envirohelm" + HUDType = DATA_HUD_SECURITY_BASIC + examine_extensions = list(EXAMINE_HUD_SKILLS) diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 8d56f14716f..6e86461364c 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -20,6 +20,13 @@ item_state = "chef_envirosuit" item_color = "chef_envirosuit" +/obj/item/clothing/under/plasmaman/nt + name = "Nanotrasen Representative plasma envirosuit" + desc = "A Nanotrasen Representative plasmaman envirosuit designed specially for official occasions." + icon_state = "ntrep_envirosuit" + item_state = "ntrep_envirosuit" + item_color = "ntrep_envirosuit" + /obj/item/clothing/under/plasmaman/enviroslacks name = "enviroslacks" desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, lawyers, and bartenders alike." diff --git a/code/modules/clothing/under/jobs/plasmamen/special.dm b/code/modules/clothing/under/jobs/plasmamen/special.dm new file mode 100644 index 00000000000..7addd4e98a7 --- /dev/null +++ b/code/modules/clothing/under/jobs/plasmamen/special.dm @@ -0,0 +1,15 @@ +/obj/item/clothing/under/plasmaman/syndicate + name = "Syndicate officer plasma envirosuit" + desc = "A plasmaman containment suit designed for Syndicate Officers, offering a limited amount of extra protection." + icon_state = "syndicate_centcomm_envirosuit" + item_state = "syndicate_centcomm_envirosuit" + item_color = "syndicate_centcomm_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95) + +/obj/item/clothing/under/plasmaman/centcomm + name = "Central command officer plasma envirosuit" + desc = "A plasmaman containment suit designed for Central Command Officers, offering a limited amount of extra protection." + icon_state = "centcomm_envirosuit" + item_state = "centcomm_envirosuit" + item_color = "centcomm_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 7692e3e93c2..a4bc3912123 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -80,15 +80,24 @@ if("Bartender") O = new /datum/outfit/plasmaman/bar - if("Internal Affairs Agent", "Magistrate", "Nanotrasen Representative", "Nanotrasen Navy Officer", "Nanotrasen Navy Field Officer") + if("Internal Affairs Agent", "Magistrate") O = new /datum/outfit/plasmaman/nt + if("Nanotrasen Representative") + O = new /datum/outfit/plasmaman/nt_rep + if("Chef") O = new /datum/outfit/plasmaman/chef - if("Security Officer", "Security Cadet", "Special Operations Officer") + if("Security Officer", "Security Cadet") O = new /datum/outfit/plasmaman/security + if("Special Operations Officer", "Nanotrasen Navy Officer", "Nanotrasen Navy Field Officer") + O = new /datum/outfit/plasmaman/specops_officer + + if("Syndicate Officer") + O = new /datum/outfit/plasmaman/syndicate_officer + if("Security Pod Pilot") O = new /datum/outfit/plasmaman/security/pod diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index 272fbb18a9f..388c0659d02 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/neck.dmi b/icons/mob/clothing/species/plasmaman/neck.dmi new file mode 100644 index 00000000000..e9fd203d8d6 Binary files /dev/null and b/icons/mob/clothing/species/plasmaman/neck.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 897cef58b8a..367238253c7 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index 13213cb66db..5c4e9ea7f04 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index 66c7fdc90a1..aa5e2230b06 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/paradise.dme b/paradise.dme index 7d22a57bf58..ccb52a7ab8f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1730,6 +1730,7 @@ #include "code\modules\clothing\under\jobs\plasmamen\engineering.dm" #include "code\modules\clothing\under\jobs\plasmamen\medsci.dm" #include "code\modules\clothing\under\jobs\plasmamen\security.dm" +#include "code\modules\clothing\under\jobs\plasmamen\special.dm" #include "code\modules\clothing\upgrade_modules\hardsuit_shield_module\hardsuit.dm" #include "code\modules\clothing\upgrade_modules\hardsuit_shield_module\hardsuit_shield.dm" #include "code\modules\clothing\upgrade_modules\hardsuit_taser_proof_module\hardsuit.dm"