From 05e785825742cbe6b403d9afb6dc5258665d4b05 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Thu, 4 Feb 2016 19:46:54 +0000 Subject: [PATCH 1/2] Fixes syndie suit name part of #3421 Fixes name and description of elite syndie suit after mode toggle Don't close #3421 yet, I'm looking into the other part but need more info --- code/modules/clothing/spacesuits/rig.dm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 1fde42aac94..d0e3e3060c9 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -348,7 +348,7 @@ on = !on if(on) user << "You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor." - name = "blood-red hardsuit helmet" + name = "blood-red hardsuit" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." slowdown = 1 flags = STOPSPRESSUREDMAGE | THICKMATERIAL @@ -356,7 +356,7 @@ cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS else user << "You switch your hardsuit to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight." - name = "blood-red hardsuit helmet (combat)" + name = "blood-red hardsuit (combat)" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." slowdown = 0 flags = THICKMATERIAL @@ -379,6 +379,15 @@ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT sprite_sheets = null +/obj/item/clothing/head/helmet/space/rig/syndi/elite/attack_self(mob/user) + ..() + if(on) + name = "elite syndicate hardsuit helmet" + desc = "An elite version of the syndicate helmet, with improved armour and fire shielding. It is in travel mode. Property of Gorlex Marauders." + else + name = "elite syndicate hardsuit helmet (combat)" + desc = "An elite version of the syndicate helmet, with improved armour and fire shielding. It is in combat mode. Property of Gorlex Marauders." + /obj/item/clothing/suit/space/rig/syndi/elite name = "elite syndicate hardsuit" desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in travel mode." @@ -389,6 +398,15 @@ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT sprite_sheets = null +/obj/item/clothing/suit/space/rig/syndi/elite/attack_self(mob/user) + ..() + if(on) + name = "elite syndicate hardsuit" + desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in travel mode. Property of Gorlex Marauders." + else + name = "elite syndicate hardsuit (combat)" + desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in combat mode. Property of Gorlex Marauders." + //Wizard Rig /obj/item/clothing/head/helmet/space/rig/wizard name = "gem-encrusted hardsuit helmet" From 11df4c50b6dc1a409e592ef621e5fd5a65211f28 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Thu, 4 Feb 2016 21:24:38 +0000 Subject: [PATCH 2/2] Fixes being able to take off helmet when toggling combat/travel modes --- code/modules/clothing/spacesuits/rig.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index d0e3e3060c9..c1d1a4fb4fc 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -311,7 +311,7 @@ user << "You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor." name = "blood-red hardsuit helmet" desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." - flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL + flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE cold_protection = HEAD set_light(brightness_on) @@ -319,7 +319,7 @@ user << "You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight." name = "blood-red hardsuit helmet (combat)" desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." - flags = BLOCKHAIR | THICKMATERIAL + flags = BLOCKHAIR | THICKMATERIAL | NODROP flags_inv = HIDEEARS cold_protection = null set_light(0)