Skip to content

Commit

Permalink
add: Added and reworked Plasmaman Envirosuits
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladisvell committed Oct 21, 2023
1 parent 7df2c3f commit 35b9b11
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 3 deletions.
18 changes: 18 additions & 0 deletions code/datums/outfits/plasmamen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
25 changes: 25 additions & 0 deletions code/modules/clothing/spacesuits/plasmamen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
15 changes: 15 additions & 0 deletions code/modules/clothing/under/jobs/plasmamen/special.dm
Original file line number Diff line number Diff line change
@@ -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)
13 changes: 11 additions & 2 deletions code/modules/mob/living/carbon/human/species/plasmaman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified icons/mob/clothing/species/plasmaman/helmet.dmi
Binary file not shown.
Binary file added icons/mob/clothing/species/plasmaman/neck.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/plasmaman/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/species/plasmaman/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/species/plasmaman/uniform.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 35b9b11

Please sign in to comment.