cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update materials.dm

Browse Source
This commit is contained in:
Novacat
2019-08-08 16:09:13 -04:00
committed by GitHub
parent 0469a309cc
commit 31924e23de
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/materials/materials.dm
View File

@@ -1091,7 +1091,4 @@ var/list/name_to_material
hardness = 1 hardness = 1
weight = 1 weight = 1
protectiveness = 0 // 0% protectiveness = 0 // 0%
<<<<<<< HEAD
=======
conductive = 0 conductive = 0
>>>>>>> 8316113... Merge pull request #6393 from Nalarac/Conductivity