cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts begone

Browse Source
This commit is contained in:
Crazylemon64
2016-08-01 18:28:47 -07:00
parent c48d216ebc
commit bc93078da5
169 changed files with 1524 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/xenobiology.dm
+1
View File
@@ -342,6 +342,7 @@
C.color = "#000080"
C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
C.heat_protection = C.body_parts_covered
C.burn_state = FIRE_PROOF
uses --
if(!uses)
qdel(src)