From aea9752eac771027790d08c0d13d052f1aa190bc Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 21 Jul 2019 20:42:29 -0800 Subject: [PATCH 1/2] Merge pull request #6316 from Heroman3003/phoronguard-again Makes rigpieces phoron immune --- code/modules/clothing/shoes/magboots.dm | 1 + code/modules/clothing/spacesuits/rig/rig_pieces.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 17a44db61d1..5020307699b 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -2,6 +2,7 @@ desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear." name = "magboots" icon_state = "magboots0" + item_flags = PHORONGUARD item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots") species_restricted = null force = 3 diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 5c4853a7917..6bc6865a212 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -23,7 +23,7 @@ /obj/item/clothing/gloves/gauntlets/rig name = "gauntlets" - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL|PHORONGUARD body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS