shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update charged.dm

Browse Source
This commit is contained in:
deathride58
2018-04-29 18:43:11 -04:00
committed by GitHub
parent 3921590a4b
commit f46a77ba5c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/crossbreeding/charged.dm
-4
View File
@@ -329,11 +329,7 @@ Charged extracts:
if(!istype(C))
to_chat(user, "<span class='warning'>The potion can only be used on clothing!</span>")
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, "<span class='warning'>The [C] is already pressure-resistant!</span>")
return ..()
to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], making it airtight.</span>")