Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds enviroskirts and durathread skirts #47231

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/datums/components/crafting/tailoring.dm
Expand Up @@ -21,6 +21,13 @@
time = 40
category = CAT_CLOTHING

/datum/crafting_recipe/durathread_jumpskirt
name = "Durathread Jumpskirt"
result = /obj/item/clothing/under/misc/durathread/skirt
reqs = list(/obj/item/stack/sheet/durathread = 4)
time = 40
category = CAT_CLOTHING

/datum/crafting_recipe/durathread_beret
name = "Durathread Beret"
result = /obj/item/clothing/head/beret/durathread
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Expand Up @@ -321,6 +321,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \

GLOBAL_LIST_INIT(durathread_recipes, list ( \
new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
new/datum/stack_recipe("durathread jumpskirt", /obj/item/clothing/under/misc/durathread/skirt, 4, time = 40),
new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
Expand Down
122 changes: 121 additions & 1 deletion code/modules/clothing/outfits/plasmaman.dm
Expand Up @@ -111,7 +111,7 @@
name = "Atmospherics Plasmaman"

head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
uniform = /obj/item/clothing/under/plasmaman/atmospherics
uniform = /obj/item/clothing/under/plasmaman/engineering/atmospherics

/datum/outfit/plasmaman/mime
name = "Plasmamime"
Expand All @@ -126,3 +126,123 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/clown
uniform = /obj/item/clothing/under/plasmaman/clown
mask = /obj/item/clothing/mask/gas/clown_hat

//skirts

/datum/outfit/plasmaman/bar/skirt
name = "Bartender Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/white
uniform = /obj/item/clothing/under/plasmaman/enviroslacks

/datum/outfit/plasmaman/chef/skirt
name = "Chef Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/white
uniform = /obj/item/clothing/under/plasmaman/chef

/datum/outfit/plasmaman/botany/skirt
name = "Botany Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/botany
uniform = /obj/item/clothing/under/plasmaman/botany

//curator has no skirt

/datum/outfit/plasmaman/chaplain/skirt
name = "Chaplain Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/chaplain
uniform = /obj/item/clothing/under/plasmaman/chaplain

/datum/outfit/plasmaman/janitor/skirt
name = "Janitor Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/janitor
uniform = /obj/item/clothing/under/plasmaman/janitor

/datum/outfit/plasmaman/security/skirt
name = "Security Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/security
uniform = /obj/item/clothing/under/plasmaman/security

/datum/outfit/plasmaman/detective/skirt
name = "Detective Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/white
uniform = /obj/item/clothing/under/plasmaman/enviroslacks
ears = /obj/item/radio/headset/headset_sec

/datum/outfit/plasmaman/warden/skirt
name = "Warden Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/security/warden
uniform = /obj/item/clothing/under/plasmaman/security/warden

/datum/outfit/plasmaman/cargo/skirt
name = "Cargo Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/cargo
uniform = /obj/item/clothing/under/plasmaman/cargo

/datum/outfit/plasmaman/mining/skirt
name = "Mining Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/mining
uniform = /obj/item/clothing/under/plasmaman/mining

/datum/outfit/plasmaman/medical/skirt
name = "Medical Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/medical
uniform = /obj/item/clothing/under/plasmaman/medical

/datum/outfit/plasmaman/viro/skirt
name = "Virology Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/viro
uniform = /obj/item/clothing/under/plasmaman/viro

/datum/outfit/plasmaman/chemist/skirt
name = "Chemist Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/chemist
uniform = /obj/item/clothing/under/plasmaman/chemist

/datum/outfit/plasmaman/genetics/skirt
name = "Genetics Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/genetics
uniform = /obj/item/clothing/under/plasmaman/genetics

/datum/outfit/plasmaman/science/skirt
name = "Science Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/science
uniform = /obj/item/clothing/under/plasmaman/science

/datum/outfit/plasmaman/robotics/skirt
name = "Robotics Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/robotics
uniform = /obj/item/clothing/under/plasmaman/robotics

/datum/outfit/plasmaman/engineering/skirt
name = "Engineering Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/engineering
uniform = /obj/item/clothing/under/plasmaman/engineering

/datum/outfit/plasmaman/atmospherics/skirt
name = "Atmospherics Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
uniform = /obj/item/clothing/under/plasmaman/engineering/atmospherics

/datum/outfit/plasmaman/mime/skirt
name = "Plasmamime With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman/mime
uniform = /obj/item/clothing/under/plasmaman/mime
mask = /obj/item/clothing/mask/gas/mime
8 changes: 8 additions & 0 deletions code/modules/clothing/outfits/standard.dm
Expand Up @@ -362,6 +362,14 @@
r_hand= /obj/item/tank/internals/plasmaman/belt/full
mask = /obj/item/clothing/mask/breath

/datum/outfit/plasmaman/skirt
name = "Plasmaman With Skirt"

head = /obj/item/clothing/head/helmet/space/plasmaman
uniform = /obj/item/clothing/under/plasmaman/skirt
r_hand= /obj/item/tank/internals/plasmaman/belt/full
mask = /obj/item/clothing/mask/breath

/datum/outfit/death_commando
name = "Death Commando"

Expand Down
48 changes: 47 additions & 1 deletion code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
Expand Up @@ -4,31 +4,60 @@
icon_state = "cargo_envirosuit"
item_state = "cargo_envirosuit"

/obj/item/clothing/under/plasmaman/cargo/skirt
name = "cargo plasma enviroskirt"
desc = "A joint enviroskirt used by plasmamen quartermasters and cargo techs alike, due to the logistical problems of differenciating the two with the length of their pant legs."
icon_state = "cargo_envirosuit"
item_state = "cargo_enviroskirt"

/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
icon_state = "explorer_envirosuit"
item_state = "explorer_envirosuit"

/obj/item/clothing/under/plasmaman/mining/skirt
name = "mining plasma enviroskirt"
desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
icon_state = "explorer_envirosuit"
item_state = "explorer_enviroskirt"

/obj/item/clothing/under/plasmaman/chef
name = "chef's plasma envirosuit"
desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
icon_state = "chef_envirosuit"
item_state = "chef_envirosuit"

/obj/item/clothing/under/plasmaman/chef/skirt
name = "chef's plasma enviroskirt"
desc = "A white plasmaman enviroskirt designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
icon_state = "chef_envirosuit"
item_state = "chef_enviroskirt"

/obj/item/clothing/under/plasmaman/enviroslacks
name = "enviroslacks"
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike."
icon_state = "enviroslacks"
item_state = "enviroslacks"

/obj/item/clothing/under/plasmaman/enviroslacks/skirt
name = "enviroslacks"
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike."
icon_state = "enviroslacks"
item_state = "enviroskirts"

/obj/item/clothing/under/plasmaman/chaplain
name = "chaplain's plasma envirosuit"
desc = "An envirosuit specially designed for only the most pious of plasmamen."
icon_state = "chap_envirosuit"
item_state = "chap_envirosuit"

/obj/item/clothing/under/plasmaman/chaplain/skirt
name = "chaplain's plasma enviroskirt"
desc = "An enviroskirt specially designed for only the most pious of plasmamen."
icon_state = "chap_envirosuit"
item_state = "chap_enviroskirt"

/obj/item/clothing/under/plasmaman/curator
name = "curator's plasma envirosuit"
desc = "Made out of a modified voidsuit, this suit was Nano-Trasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
Expand All @@ -41,19 +70,36 @@
icon_state = "janitor_envirosuit"
item_state = "janitor_envirosuit"

/obj/item/clothing/under/plasmaman/janitor/skirt
name = "janitor's plasma enviroskirt"
desc = "A grey and purple enviroskirt designated for plasmamen janitors."
icon_state = "janitor_envirosuit"
item_state = "janitor_enviroskirt"

/obj/item/clothing/under/plasmaman/botany
name = "botany envirosuit"
desc = "A green and blue envirosuit designed to protect plasmamen from minor plant-related injuries."
icon_state = "botany_envirosuit"
item_state = "botany_envirosuit"

/obj/item/clothing/under/plasmaman/botany/skirt
name = "botany enviroskirt"
desc = "A green and blue enviroskirt designed to protect plasmamen from minor plant-related injuries."
icon_state = "botany_envirosuit"
item_state = "botany_enviroskirt"

/obj/item/clothing/under/plasmaman/mime
name = "mime envirosuit"
desc = "It's not very colourful."
icon_state = "mime_envirosuit"
item_state = "mime_envirosuit"

/obj/item/clothing/under/plasmaman/mime/skirt
name = "mime enviroskirt"
desc = "It's not very colourful."
icon_state = "mime_envirosuit"
item_state = "mime_enviroskirt"

/obj/item/clothing/under/plasmaman/clown
name = "clown envirosuit"
desc = "<i>'HONK!'</i>"
Expand All @@ -72,5 +118,5 @@
extinguishes_left--
H.visible_message("<span class='warning'>[H]'s suit spews out a tonne of space lube!</span>","<span class='warning'>Your suit spews out a tonne of space lube!</span>")
H.ExtinguishMob()
new /obj/effect/particle_effect/foam(loc) //Truely terrifying.
new /obj/effect/particle_effect/foam(loc) //Truly terrifying.
return 0
13 changes: 12 additions & 1 deletion code/modules/clothing/under/jobs/Plasmaman/engineering.dm
Expand Up @@ -5,9 +5,20 @@
item_state = "engineer_envirosuit"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 95, "acid" = 95)

/obj/item/clothing/under/plasmaman/atmospherics
/obj/item/clothing/under/plasmaman/engineering/skirt
name = "engineering plasma enviroskirt"
desc = "An air-tight suit designed to be used by plasmamen exployed as engineers, the usual purple stripes being replaced by engineer's orange. It protects the user from fire and acid damage."
icon_state = "engineer_enviroskirt"
item_state = "engineer_enviroskirt"

/obj/item/clothing/under/plasmaman/engineering/atmospherics
name = "atmospherics plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue."
icon_state = "atmos_envirosuit"
item_state = "atmos_envirosuit"

/obj/item/clothing/under/plasmaman/engineering/atmospherics/skirt
name = "atmospherics plasma enviroskirt"
desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue."
icon_state = "atmos_enviroskirt"
item_state = "atmos_enviroskirt"
36 changes: 36 additions & 0 deletions code/modules/clothing/under/jobs/Plasmaman/medsci.dm
Expand Up @@ -4,32 +4,68 @@
icon_state = "doctor_envirosuit"
item_state = "doctor_envirosuit"

/obj/item/clothing/under/plasmaman/medical/skirt
name = "medical plasma enviroskirt"
desc = "A suit designed for the station's more plasma-based doctors."
icon_state = "doctor_enviroskirt"
item_state = "doctor_enviroskirt"

/obj/item/clothing/under/plasmaman/science
name = "science plasma envirosuit"
desc = "A plasmaman envirosuit designed for scientists."
icon_state = "scientist_envirosuit"
item_state = "scientist_envirosuit"

/obj/item/clothing/under/plasmaman/science/skirt
name = "science plasma enviroskirt"
desc = "A plasmaman enviroskirt designed for scientists."
icon_state = "scientist_enviroskirt"
item_state = "scientist_enviroskirt"

/obj/item/clothing/under/plasmaman/robotics
name = "robotics plasma envirosuit"
desc = "A plasmaman envirosuit designed for roboticists."
icon_state = "roboticist_envirosuit"
item_state = "roboticist_envirosuit"

/obj/item/clothing/under/plasmaman/robotics/skirt
name = "robotics plasma enviroskirt"
desc = "A plasmaman enviroskirt designed for roboticists."
icon_state = "roboticist_enviroskirt"
item_state = "roboticist_enviroskirt"

/obj/item/clothing/under/plasmaman/viro
name = "virology plasma envirosuit"
desc = "The suit worn by the safest people on the station, those who are completely immune to the monstrosities they create."
icon_state = "virologist_envirosuit"
item_state = "virologist_envirosuit"

/obj/item/clothing/under/plasmaman/viro/skirt
name = "virology plasma enviroskirt"
desc = "The skirt worn by the safest people on the station, those who are completely immune to the monstrosities they create."
icon_state = "virologist_enviroskirt"
item_state = "virologist_enviroskirt"

/obj/item/clothing/under/plasmaman/genetics
name = "genetics plasma envirosuit"
desc = "A plasmaman envirosuit designed for geneticists."
icon_state = "geneticist_envirosuit"
item_state = "geneticist_envirosuit"

/obj/item/clothing/under/plasmaman/genetics/skirt
name = "genetics plasma enviroskirt"
desc = "A plasmaman enviroskirt designed for geneticists."
icon_state = "geneticist_enviroskirt"
item_state = "geneticist_enviroskirt"

/obj/item/clothing/under/plasmaman/chemist
name = "chemistry plasma envirosuit"
desc = "A plasmaman envirosuit designed for chemists."
icon_state = "chemist_envirosuit"
item_state = "chemist_envirosuit"

/obj/item/clothing/under/plasmaman/chemist/skirt
name = "chemistry plasma enviroskirt"
desc = "A plasmaman enviroskirt designed for chemists."
icon_state = "chemist_enviroskirt"
item_state = "chemist_enviroskirt"
12 changes: 12 additions & 0 deletions code/modules/clothing/under/jobs/Plasmaman/security.dm
Expand Up @@ -5,8 +5,20 @@
item_state = "security_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/security/skirt
name = "security plasma enviroskirt"
desc = "A plasmaman containment skirtsuit designed for security officers, offering a limited amount of extra protection. This one has plastic tubing 'stockings'."
icon_state = "security_enviroskirt"
item_state = "security_enviroskirt"

/obj/item/clothing/under/plasmaman/security/warden
name = "warden plasma envirosuit"
desc = "A plasmaman containment suit designed for the warden, white stripes being added to differeciate them from other members of security."
icon_state = "warden_envirosuit"
item_state = "warden_envirosuit"

/obj/item/clothing/under/plasmaman/security/warden/skirt
name = "warden plasma enviroskirt"
desc = "A plasmaman containment skirtsuit designed for the warden, white stripes being added to differeciate them from other members of security. This one has plastic tubing 'stockings'."
icon_state = "warden_enviroskirt"
item_state = "warden_enviroskirt"