diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 446d7ef13ec..49972acd934 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -3,17 +3,15 @@ /obj/item/clothing/suit/space/eva/plasmaman name = "plasmaman suit" desc = "A special containment suit designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies." - w_class = 3 allowed = list(/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank) - slowdown = 2 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0) + slowdown = 0 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list("Plasmaman") flags = STOPSPRESSUREDMAGE | PLASMAGUARD - pressure_resistance = 40 * ONE_ATMOSPHERE //we can't change, so some resistance is needed icon_state = "plasmaman_suit" item_state = "plasmaman_suit" @@ -41,7 +39,6 @@ name = "plasmaman helmet" desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies." flags = STOPSPRESSUREDMAGE | PLASMAGUARD - pressure_resistance = 40 * ONE_ATMOSPHERE species_restricted = list("Plasmaman") icon_state = "plasmaman_helmet0" @@ -64,6 +61,7 @@ else user.SetLuminosity(user.luminosity - brightness_on) user.update_inv_head() + /obj/item/clothing/head/helmet/space/eva/plasmaman/pickup(mob/user) if(on) user.SetLuminosity(user.luminosity + brightness_on) @@ -82,7 +80,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/assistant name = "plasmaman assistant suit" icon_state = "plasmamanAssistant_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/assistant name = "plasmaman assistant helmet" @@ -92,29 +89,26 @@ /obj/item/clothing/suit/space/eva/plasmaman/atmostech name = "plasmaman atmospheric suit" icon_state = "plasmamanAtmos_suit" - armor = list(melee = 20, bullet = 0, laser = 0,energy = 0, bomb = 25, bio = 100, rad = 0) + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 0) max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech name = "plasmaman atmospheric helmet" icon_state = "plasmamanAtmos_helmet0" base_state = "plasmamanAtmos_helmet" - armor = list(melee = 20, bullet = 0, laser = 0,energy = 0, bomb = 25, bio = 100, rad = 0) + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 0) max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/suit/space/eva/plasmaman/engineer name = "plasmaman engineer suit" icon_state = "plasmamanEngineer_suit" - armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80) - pressure_resistance = 200 * ONE_ATMOSPHERE - slowdown = 1 + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) /obj/item/clothing/head/helmet/space/eva/plasmaman/engineer name = "plasmaman engineer helmet" icon_state = "plasmamanEngineer_helmet0" base_state = "plasmamanEngineer_helmet" - armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80) - pressure_resistance = 200 * ONE_ATMOSPHERE + armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) /obj/item/clothing/suit/space/eva/plasmaman/engineer/ce name = "plasmaman chief engineer suit" @@ -133,7 +127,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/botanist name = "plasmaman botanist suit" icon_state = "plasmamanBotanist_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/botanist name = "plasmaman botanist helmet" @@ -143,7 +136,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/chaplain name = "plasmaman chaplain suit" icon_state = "plasmamanChaplain_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain name = "plasmaman chaplain helmet" @@ -153,7 +145,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/clown name = "plasmaman clown suit" icon_state = "plasmaman_Clown" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/clown name = "plasmaman clown helmet" @@ -163,7 +154,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/mime name = "plasmaman mime suit" icon_state = "plasmaman_Mime" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/mime name = "plasmaman mime helmet" @@ -173,7 +163,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/service name = "plasmaman service suit" icon_state = "plasmamanService_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/service name = "plasmaman service helmet" @@ -183,7 +172,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/janitor name = "plasmaman janitor suit" icon_state = "plasmamanJanitor_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/janitor name = "plasmaman janitor helmet" @@ -196,7 +184,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/cargo name = "plasmaman cargo suit" icon_state = "plasmamanCargo_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/cargo name = "plasmaman cargo helmet" @@ -206,13 +193,13 @@ /obj/item/clothing/suit/space/eva/plasmaman/miner name = "plasmaman miner suit" icon_state = "plasmamanMiner_suit" - armor = list(melee = 30, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 20) + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50) /obj/item/clothing/head/helmet/space/eva/plasmaman/miner name = "plasmaman miner helmet" icon_state = "plasmamanMiner_helmet0" base_state = "plasmamanMiner_helmet" - armor = list(melee = 30, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 20) + armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50) // MEDSCI @@ -220,7 +207,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/medical name = "plasmaman medical suit" icon_state = "plasmamanMedical_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/medical name = "plasmaman medical helmet" @@ -230,7 +216,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/medical/paramedic name = "plasmaman paramedic suit" icon_state = "plasmaman_Paramedic" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/medical/paramedic name = "plasmaman paramedic helmet" @@ -240,7 +225,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/medical/chemist name = "plasmaman chemist suit" icon_state = "plasmaman_Chemist" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/medical/chemist name = "plasmaman chemist helmet" @@ -259,7 +243,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/science name = "plasmaman scientist suit" icon_state = "plasmamanScience_suit" - slowdown = 1 /obj/item/clothing/head/helmet/space/eva/plasmaman/science name = "plasmaman scientist helmet" @@ -281,14 +264,13 @@ /obj/item/clothing/suit/space/eva/plasmaman/security name = "plasmaman security suit" icon_state = "plasmamanSecurity_suit" - slowdown = 1 - armor = list(melee = 40, bullet = 15, laser = 35,energy = 5, bomb = 35, bio = 100, rad = 20) + armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50) /obj/item/clothing/head/helmet/space/eva/plasmaman/security name = "plasmaman security helmet" icon_state = "plasmamanSecurity_helmet0" base_state = "plasmamanSecurity_helmet" - armor = list(melee = 40, bullet = 15, laser = 35,energy = 5, bomb = 35, bio = 100, rad = 20) + armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50) /obj/item/clothing/suit/space/eva/plasmaman/security/hos name = "plasmaman head of security suit" @@ -322,7 +304,6 @@ /obj/item/clothing/suit/space/eva/plasmaman/nuclear name = "blood red plasmaman suit" icon_state = "plasmaman_Nukeops" - slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs) siemens_coefficient = 0.6 diff --git a/code/modules/mob/living/carbon/human/plasmaman/species.dm b/code/modules/mob/living/carbon/human/plasmaman/species.dm index 53a0b839a88..55f7091142e 100644 --- a/code/modules/mob/living/carbon/human/plasmaman/species.dm +++ b/code/modules/mob/living/carbon/human/plasmaman/species.dm @@ -48,22 +48,22 @@ if("Chief Engineer") suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer/ce helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer/ce - if("Atmospheric Technician") + if("Life Support Specialist") suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech - if("Warden","Detective","Security Officer") + if("Warden","Detective","Security Officer","Security Pod Pilot") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/ helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/ - if("Head of Security") + if("Head of Security", "Magistrate") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/hos helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/hos - if("Captain") + if("Captain", "Blueshield") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/captain helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/captain - if("Head of Personnel") + if("Head of Personnel", "Nanotrasen Representative") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/hop helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/hop - if("Medical Doctor") + if("Medical Doctor","Brig Physician") suit=/obj/item/clothing/suit/space/eva/plasmaman/medical helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical if("Paramedic") @@ -93,7 +93,7 @@ if("Janitor") suit=/obj/item/clothing/suit/space/eva/plasmaman/janitor helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor - if("Assistant") + if("Civilian", "Barber") suit=/obj/item/clothing/suit/space/eva/plasmaman/assistant helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant if("Clown") diff --git a/code/setup.dm b/code/setup.dm index 72f56088a42..01542984028 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -223,7 +223,7 @@ var/MAX_EX_FLASH_RANGE = 14 #define BLOCK_GAS_SMOKE_EFFECT 8192 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) #define ONESIZEFITSALL 8192 -#define PLASMAGUARD 1638 //Does not get contaminated by plasma. +#define PLASMAGUARD 16384 //Does not get contaminated by plasma. #define NOREACT 16384 //Reagents dont' react inside this container. diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c867306c98c..23403dcfd9e 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ