cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update materials.dm

Browse Source
This commit is contained in:
Novacat
2019-04-13 22:55:08 -04:00
committed by GitHub
parent fc7c6f38b4
commit 6d123c8d73
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+1 -5
View File
@@ -359,11 +359,7 @@ var/list/name_to_material
name = "marble"
icon_colour = "#AAAAAA"
weight = 26
<<<<<<< HEAD
hardness = 30 //VOREStation Edit - Please.
=======
hardness = 70
>>>>>>> 4ff3ee1... Merge pull request #6023 from Mechoid/Precursotech_Baseline
integrity = 201 //hack to stop kitchen benches being flippable, todo: refactor into weight system
stack_type = /obj/item/stack/material/marble
@@ -1070,4 +1066,4 @@ var/list/name_to_material
icon_colour = "#ff9900"
hardness = 1
weight = 1
protectiveness = 0 // 0%
protectiveness = 0 // 0%