Merge pull request #53042 from GuillaumePrata/Plasmamen---Command

Adds Plasmamen Command and Centcom suits.
This commit is contained in:
nemvar
2020-08-21 21:47:34 +02:00
committed by GitHub
15 changed files with 263 additions and 22 deletions
@@ -145,3 +145,39 @@
desc = "These gloves have been enchanted with a spell that makes them electrically insulated and fireproof."
icon_state = "wizard"
inhand_icon_state = "purplegloves"
/obj/item/clothing/gloves/color/plasmaman/head_of_personnel
name = "head of personnel's envirogloves"
desc = "Covers up those scandalous, bony hands. Appears to be an attempt at making a replica of the captain's gloves."
icon_state = "hopplasma"
inhand_icon_state = "hopplasma"
/obj/item/clothing/gloves/color/plasmaman/chief_engineer
name = "chief engineer's envirogloves"
icon_state = "ceplasma"
inhand_icon_state = "ceplasma"
/obj/item/clothing/gloves/color/plasmaman/chief_medical_officer
name = "chief medical officer's envirogloves"
icon_state = "cmoplasma"
inhand_icon_state = "cmoplasma"
/obj/item/clothing/gloves/color/plasmaman/research_director
name = "research director's envirogloves"
icon_state = "rdplasma"
inhand_icon_state = "rdplasma"
/obj/item/clothing/gloves/color/plasmaman/centcom_commander
name = "CentCom commander envirogloves"
icon_state = "commanderplasma"
inhand_icon_state = "commanderplasma"
/obj/item/clothing/gloves/color/plasmaman/centcom_official
name = "CentCom official envirogloves"
icon_state = "officialplasma"
inhand_icon_state = "officialplasma"
/obj/item/clothing/gloves/color/plasmaman/centcom_intern
name = "CentCom intern envirogloves"
icon_state = "internplasma"
inhand_icon_state = "internplasma"
+9 -8
View File
@@ -95,7 +95,7 @@
glasses = /obj/item/clothing/glasses/hud/health
back = /obj/item/storage/backpack/ert/medical
belt = /obj/item/storage/belt/medical
r_hand = /obj/item/storage/firstaid/regular
l_hand = /obj/item/storage/firstaid/regular
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/melee/baton/loaded=1,\
/obj/item/gun/energy/e_gun=1,\
@@ -131,12 +131,13 @@
back = /obj/item/storage/backpack/ert/engineer
belt = /obj/item/storage/belt/utility/full
l_pocket = /obj/item/rcd_ammo/large
r_hand = /obj/item/storage/firstaid/regular
l_hand = /obj/item/storage/firstaid/regular
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/melee/baton/loaded=1,\
/obj/item/gun/energy/e_gun=1,\
/obj/item/construction/rcd/loaded=1)
/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -192,7 +193,7 @@
/datum/outfit/centcom/ert/commander/inquisitor
name = "Inquisition Commander"
r_hand = /obj/item/nullrod/scythe/talking/chainsword
l_hand = /obj/item/nullrod/scythe/talking/chainsword
suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
/obj/item/gun/energy/e_gun=1)
@@ -283,7 +284,7 @@
name = "ERT Janitor - Heavy Duty"
mask = /obj/item/clothing/mask/gas/sechailer/swat
r_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor
l_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/storage/box/lights/mixed=1,\
/obj/item/melee/baton/loaded=1,\
@@ -327,7 +328,7 @@
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
belt = /obj/item/melee/classic_baton
r_hand = /obj/item/gun/ballistic/rifle/boltaction
l_hand = /obj/item/gun/ballistic/rifle/boltaction
back = /obj/item/storage/backpack/satchel
l_pocket = /obj/item/ammo_box/a762
r_pocket = /obj/item/ammo_box/a762
@@ -350,7 +351,7 @@
belt = /obj/item/melee/baton/loaded
suit = /obj/item/clothing/suit/armor/vest
suit_store = /obj/item/gun/ballistic/rifle/boltaction
r_hand = /obj/item/megaphone
l_hand = /obj/item/megaphone
head = /obj/item/clothing/head/intern
/datum/outfit/centcom/ert/janitor/party
@@ -389,7 +390,7 @@
mask = /obj/item/clothing/mask/gas/atmos
head = /obj/item/clothing/head/hardhat/weldhat
suit = /obj/item/clothing/suit/hazardvest
r_hand = /obj/item/areaeditor/blueprints
l_hand = /obj/item/areaeditor/blueprints
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/stack/sheet/metal/fifty=1,\
/obj/item/stack/sheet/glass/fifty=1,\
@@ -416,7 +417,7 @@
head = /obj/item/clothing/head/coordinator
suit = /obj/item/clothing/suit/coordinator
belt = /obj/item/storage/belt/sabre
r_hand = /obj/item/toy/balloon
l_hand = /obj/item/toy/balloon
l_pocket = /obj/item/kitchen/knife
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/storage/box/fireworks=3,\
@@ -162,3 +162,69 @@
uniform = /obj/item/clothing/under/plasmaman/clown
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/color/plasmaman/clown
/datum/outfit/plasmaman/captain
name = "Captain Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/captain
uniform = /obj/item/clothing/under/plasmaman/captain
gloves = /obj/item/clothing/gloves/color/captain //Too iconic to be replaced with a plasma version
/datum/outfit/plasmaman/head_of_personnel
name = "Head of Personnel Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/head_of_personnel
uniform = /obj/item/clothing/under/plasmaman/head_of_personnel
gloves = /obj/item/clothing/gloves/color/plasmaman/head_of_personnel
/datum/outfit/plasmaman/head_of_security
name = "Head of Security Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/security/head_of_security
uniform = /obj/item/clothing/under/plasmaman/security/head_of_security
gloves = /obj/item/clothing/gloves/color/plasmaman/black
/datum/outfit/plasmaman/chief_engineer
name = "Chief Engineer Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/chief_engineer
uniform = /obj/item/clothing/under/plasmaman/chief_engineer
gloves = /obj/item/clothing/gloves/color/plasmaman/chief_engineer
/datum/outfit/plasmaman/chief_medical_officer
name = "Chief Medical Officer Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer
uniform = /obj/item/clothing/under/plasmaman/chief_medical_officer
gloves = /obj/item/clothing/gloves/color/plasmaman/chief_medical_officer
/datum/outfit/plasmaman/research_director
name = "Research Director Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/research_director
uniform = /obj/item/clothing/under/plasmaman/research_director
gloves = /obj/item/clothing/gloves/color/plasmaman/research_director
/datum/outfit/plasmaman/centcom_commander
name = "CentCom Command Plasmaman"
mask = /obj/item/clothing/mask/gas/sechailer
head = /obj/item/clothing/head/helmet/space/plasmaman/centcom_commander
uniform = /obj/item/clothing/under/plasmaman/centcom_commander
gloves = /obj/item/clothing/gloves/color/plasmaman/centcom_commander
/datum/outfit/plasmaman/centcom_official
name = "CentCom Official Plasmaman"
mask = /obj/item/clothing/mask/breath
head = /obj/item/clothing/head/helmet/space/plasmaman/centcom_official
uniform = /obj/item/clothing/under/plasmaman/centcom_official
gloves = /obj/item/clothing/gloves/color/plasmaman/centcom_official
/datum/outfit/plasmaman/centcom_intern
name = "CentCom Intern Plasmaman"
mask = /obj/item/clothing/mask/breath
head = /obj/item/clothing/head/helmet/space/plasmaman/centcom_intern
uniform = /obj/item/clothing/under/plasmaman/centcom_intern
gloves = /obj/item/clothing/gloves/color/plasmaman/centcom_intern
+7 -7
View File
@@ -54,7 +54,7 @@
shoes = /obj/item/clothing/shoes/sneakers/black
suit = /obj/item/clothing/suit/armor/vest
head = /obj/item/clothing/head/helmet/thunderdome
r_hand = /obj/item/gun/energy/pulse/destroyer
l_hand = /obj/item/gun/energy/pulse/destroyer
l_hand = /obj/item/kitchen/knife
r_pocket = /obj/item/grenade/smokebomb
@@ -70,7 +70,7 @@
suit = /obj/item/clothing/suit/det_suit
glasses = /obj/item/clothing/glasses/thermal/monocle
head = /obj/item/clothing/head/fedora/det_hat
r_hand = /obj/item/gun/ballistic
l_hand = /obj/item/gun/ballistic
l_hand = null
r_pocket = /obj/item/ammo_box/c10mm
@@ -162,7 +162,7 @@
l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
r_pocket = /obj/item/bikehorn
id = /obj/item/card/id
r_hand = /obj/item/fireaxe
l_hand = /obj/item/fireaxe
/datum/outfit/tunnel_clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
@@ -187,7 +187,7 @@
suit = /obj/item/clothing/suit/apron
l_pocket = /obj/item/kitchen/knife
r_pocket = /obj/item/scalpel
r_hand = /obj/item/fireaxe
l_hand = /obj/item/fireaxe
/datum/outfit/psycho/post_equip(mob/living/carbon/human/H)
for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
@@ -273,7 +273,7 @@
uniform = /obj/item/clothing/under/color/black/ghost
suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
shoes = /obj/item/clothing/shoes/cult/alt/ghost
r_hand = /obj/item/melee/cultblade/ghost
l_hand = /obj/item/melee/cultblade/ghost
/datum/outfit/wizard
name = "Blue Wizard"
@@ -352,7 +352,7 @@
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
r_hand = /obj/item/gun/ballistic/automatic/tommygun
l_hand = /obj/item/gun/ballistic/automatic/tommygun
id = /obj/item/card/id
/datum/outfit/mobster/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -388,7 +388,7 @@
r_pocket = /obj/item/shield/energy
suit_store = /obj/item/tank/internals/emergency_oxygen/double
belt = /obj/item/gun/ballistic/revolver/mateba
r_hand = /obj/item/gun/energy/pulse/loyalpin
l_hand = /obj/item/gun/energy/pulse/loyalpin
id = /obj/item/card/id/ert/deathsquad
ears = /obj/item/radio/headset/headset_cent/alt
+64 -6
View File
@@ -145,6 +145,13 @@
icon_state = "warden_envirohelm"
inhand_icon_state = "warden_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/security/head_of_security
name = "head of security's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Head of Security. A pair of gold stripes are added to differentiate them from other members of security."
icon_state = "hos_envirohelm"
inhand_icon_state = "hos_envirohelm"
armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10)
/obj/item/clothing/head/helmet/space/plasmaman/prisoner
name = "prisoner's plasma envirosuit helmet"
desc = "A plasmaman containment helmet for prisoners."
@@ -163,12 +170,6 @@
icon_state = "paramedic_envirohelm"
inhand_icon_state = "paramedic_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/genetics
name = "geneticist's plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for geneticists."
icon_state = "geneticist_envirohelm"
inhand_icon_state = "geneticist_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/viro
name = "virology plasma envirosuit helmet"
desc = "The helmet worn by the safest people on the station, those who are completely immune to the monstrosities they create."
@@ -181,6 +182,12 @@
icon_state = "chemist_envirohelm"
inhand_icon_state = "chemist_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer
name = "chief medical officer's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Chief Medical Officer. A light grey design is applied to differentiate them from other medical staff."
icon_state = "cmo_envirohelm"
inhand_icon_state = "cmo_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/science
name = "science plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for scientists."
@@ -193,6 +200,18 @@
icon_state = "roboticist_envirohelm"
inhand_icon_state = "roboticist_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/genetics
name = "geneticist's plasma envirosuit helmet"
desc = "A plasmaman envirohelmet designed for geneticists."
icon_state = "geneticist_envirohelm"
inhand_icon_state = "geneticist_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/research_director
name = "research director's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Research Director. A light brown design is applied to differentiate them from other scientists."
icon_state = "rd_envirohelm"
inhand_icon_state = "rd_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/engineering
name = "engineering plasma envirosuit helmet"
desc = "A space-worthy helmet specially designed for engineer plasmamen, the usual purple stripes being replaced by engineering's orange."
@@ -205,6 +224,14 @@
desc = "A space-worthy helmet specially designed for atmos technician plasmamen, the usual purple stripes being replaced by engineering's blue."
icon_state = "atmos_envirohelm"
inhand_icon_state = "atmos_envirohelm"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 75)
/obj/item/clothing/head/helmet/space/plasmaman/chief_engineer
name = "chief engineer's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Chief Engineer. An expensive, element resistant white and green carapace design is applied to protect the plasmaman inside."
icon_state = "ce_envirohelm"
inhand_icon_state = "ce_envirohelm"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 75)
/obj/item/clothing/head/helmet/space/plasmaman/cargo
name = "cargo plasma envirosuit helmet"
@@ -266,3 +293,34 @@
inhand_icon_state = "clown_envirohelm"
visor_icon = "clown_envisor"
smile_state = "clown_smile"
/obj/item/clothing/head/helmet/space/plasmaman/head_of_personnel
name = "head of personnel's envirosuit helmet"
desc = "A special containment helmet designed for the Head of Personnel. Embarrassingly enough, it looks way too much like the captain's design save for the red stripes."
icon_state = "hop_envirohelm"
inhand_icon_state = "hop_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/captain
name = "captain's plasma envirosuit helmet"
desc = "A special containment helmet designed for the Captain. Embarrassingly enough, it looks way too much like the Head of Personnel's design save for the gold stripes. I mean, come on. Gold stripes can fix anything."
icon_state = "captain_envirohelm"
inhand_icon_state = "captain_envirohelm"
armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10)
/obj/item/clothing/head/helmet/space/plasmaman/centcom_commander
name = "CentCom commander plasma envirosuit helmet"
desc = "A special containment helmet designed for the Higher Central Command Staff. Not many of these exist, as CentCom does not usually employ plasmamen to higher staff positions due to their complications."
icon_state = "commander_envirohelm"
inhand_icon_state = "commander_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/centcom_official
name = "CentCom official plasma envirosuit helmet"
desc = "A special containment helmet designed for CentCom Staff. They sure do love their green."
icon_state = "official_envirohelm"
inhand_icon_state = "official_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/centcom_intern
name = "CentCom intern plasma envirosuit helmet"
desc = "A special containment helmet designed for CentCom Staff. You know, so any coffee spills don't kill the poor sod."
icon_state = "intern_envirohelm"
inhand_icon_state = "intern_envirohelm"
@@ -0,0 +1,17 @@
/obj/item/clothing/under/plasmaman/centcom_commander
name = "CentCom commander plasma envirosuit"
desc = "It's an envirosuit worn by CentCom's highest-tier Commanders."
icon_state = "commander_envirosuit"
inhand_icon_state = "commander_envirosuit"
/obj/item/clothing/under/plasmaman/centcom_official
name = "CentCom official plasma envirosuit"
desc = "It's an envirosuit worn by CentCom Officers."
icon_state = "official_envirosuit"
inhand_icon_state = "official_envirosuit"
/obj/item/clothing/under/plasmaman/centcom_intern
name = "CentCom intern plasma envirosuit"
desc = "It's an envirosuit worn by those interning for CentCom. The top is styled after a polo shirt for easy identification."
icon_state = "intern_envirosuit"
inhand_icon_state = "intern_envirosuit"
@@ -0,0 +1,44 @@
/obj/item/clothing/under/plasmaman/captain
name = "captain's plasma envirosuit"
desc = "It's a blue envirosuit with some gold markings denoting the rank of \"Captain\"."
icon_state = "captain_envirosuit"
inhand_icon_state = "captain_envirosuit"
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95, "wound" = 15)
/obj/item/clothing/under/plasmaman/head_of_personnel
name = "head of personnel's plasma envirosuit"
desc = "It's an envirosuit worn by someone who works in the position of \"Head of Personnel\"."
icon_state = "hop_envirosuit"
inhand_icon_state = "hop_envirosuit"
/obj/item/clothing/under/plasmaman/security/head_of_security
name = "head of security's envirosuit"
desc = "A plasmaman containment suit decorated for those few with the dedication to achieve the position of Head of Security."
icon_state = "hos_envirosuit"
inhand_icon_state = "hos_envirosuit"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95, "wound" = 10)
sensor_mode = 3
random_sensor = FALSE
/obj/item/clothing/under/plasmaman/chief_engineer
name = "chief engineer's plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen insane enough to achieve the rank of \"Chief Engineer\"."
icon_state = "ce_envirosuit"
inhand_icon_state = "ce_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/chief_medical_officer
name = "chief medical officer's plasma envirosuit"
desc = "It's an envirosuit worn by those with the experience to be \"Chief Medical Officer\"."
icon_state = "cmo_envirosuit"
inhand_icon_state = "cmo_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/research_director
name = "chief engineer's plasma envirosuit"
desc = "It's an envirosuit worn by those with the know-how to achieve the position of \"Research Director\"."
icon_state = "rd_envirosuit"
inhand_icon_state = "rd_envirosuit"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 95, "acid" = 95)
@@ -137,6 +137,24 @@
if("Clown")
O = new /datum/outfit/plasmaman/clown
if("Captain")
O = new /datum/outfit/plasmaman/captain
if("Head of Personnel")
O = new /datum/outfit/plasmaman/head_of_personnel
if("Head of Security")
O = new /datum/outfit/plasmaman/head_of_security
if("Chief Engineer")
O = new /datum/outfit/plasmaman/chief_engineer
if("Chief Medical Officer")
O = new /datum/outfit/plasmaman/chief_medical_officer
if("Research Director")
O = new /datum/outfit/plasmaman/research_director
H.equipOutfit(O, visualsOnly)
H.internal = H.get_item_for_held_index(2)
H.update_internals_hud_icon(1)
@@ -196,4 +214,3 @@
H.emote("sigh")
H.reagents.remove_reagent(chem.type, chem.metabolization_rate)
return TRUE
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 KiB

After

Width:  |  Height:  |  Size: 209 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 12 KiB

+2
View File
@@ -1816,7 +1816,9 @@
#include "code\modules\clothing\under\jobs\civilian\civilian.dm"
#include "code\modules\clothing\under\jobs\civilian\clown_mime.dm"
#include "code\modules\clothing\under\jobs\civilian\curator.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\centcom.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\civilian_service.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\command.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\engineering.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\medsci.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\security.dm"