From b01c0bb40ce025597f02118b771889e3b308b3d0 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 24 Apr 2019 16:12:03 -0500 Subject: [PATCH 1/2] Merge pull request #6126 from Heroman3003/phoronguard Fixes some items having item_flag PHORONGUARD --- code/modules/clothing/spacesuits/rig/suits/alien.dm | 3 ++- code/modules/clothing/spacesuits/spacesuits.dm | 2 +- code/modules/clothing/suits/bio.dm | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 27b97df92ba..56c7fe63676 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -47,7 +47,8 @@ suit_type = "alien" icon_state = "vox_rig" armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50) - item_flags = THICKMATERIAL|PHORONGUARD + flags = PHORONGUARD + item_flags = THICKMATERIAL siemens_coefficient = 0.2 offline_slowdown = 5 allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index f1f67925e21..9143c1ae9bd 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -58,7 +58,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 flags = PHORONGUARD - item_flags = THICKMATERIAL | PHORONGUARD + item_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/suit_cooling_unit) slowdown = 3 diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 4ac233529e5..8dab882db94 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -8,7 +8,8 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES siemens_coefficient = 0.9 - item_flags = THICKMATERIAL | PHORONGUARD + flags = PHORONGUARD + item_flags = THICKMATERIAL /obj/item/clothing/suit/bio_suit name = "bio suit" @@ -23,7 +24,8 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER siemens_coefficient = 0.9 - item_flags = THICKMATERIAL | PHORONGUARD + flags = PHORONGUARD + item_flags = THICKMATERIAL //Standard biosuit, orange stripe /obj/item/clothing/head/bio_hood/general