From f46a77ba5c786c33640ab5e851fe9c0a80bd8bf9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 29 Apr 2018 18:43:11 -0400 Subject: [PATCH] Update charged.dm --- code/modules/research/xenobiology/crossbreeding/charged.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index daa90d641f..3e71ee1d21 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -329,11 +329,7 @@ Charged extracts: if(!istype(C)) to_chat(user, "The potion can only be used on clothing!") return -<<<<<<< HEAD - if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && STOPSPRESSUREDMAGE_1 in C.flags_1) -======= if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && C.clothing_flags & STOPSPRESSUREDAMAGE) ->>>>>>> 98f8ca7... Moves several clothing-specific flags from /atom to their proper type (#37486) to_chat(user, "The [C] is already pressure-resistant!") return ..() to_chat(user, "You slather the blue gunk over the [C], making it airtight.")