cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-13 22:47:26 -04:00
committed by GitHub
parent 50dd8ad121
commit ab141bf081
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/materials/materials/organic/cloth.dm
View File

@@ -127,11 +127,6 @@
ignition_point = T0C+232 ignition_point = T0C+232
melting_point = T0C+300 melting_point = T0C+300
protectiveness = 1 // 4% protectiveness = 1 // 4%
<<<<<<< HEAD
conductive = 0
||||||| parent of f9d340f23b... Merge pull request #11025 from VOREStation/Arokha/crafty
conductive = 0
=======
conductive = 0 conductive = 0
/datum/material/fibers /datum/material/fibers
@@ -146,4 +141,3 @@
protectiveness = 1 // 4% protectiveness = 1 // 4%
conductive = 0 conductive = 0
pass_stack_colors = TRUE pass_stack_colors = TRUE
>>>>>>> f9d340f23b... Merge pull request #11025 from VOREStation/Arokha/crafty