cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 04:26:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor

Browse Source
This commit is contained in:
Neerti
2017-04-14 03:54:23 -04:00
parent 88d62cffdb e5fd28818d
commit 5b4ab95bd5
534 changed files with 17904 additions and 11078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+7 -1
View File
@@ -604,7 +604,7 @@ var/list/name_to_material
stack_type = /obj/item/stack/material/wood
icon_colour = "#824B28"
integrity = 50
icon_base = "solid"
icon_base = "wood"
explosion_resistance = 2
shard_type = SHARD_SPLINTER
shard_can_repair = 0 // you can't weld splinters back into planks
@@ -625,6 +625,12 @@ var/list/name_to_material
stack_type = null
shard_type = SHARD_NONE
/material/wood/sif
name = "alien wood"
// stack_type = /obj/item/stack/material/wood/sif
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer.
/material/cardboard
name = "cardboard"
stack_type = /obj/item/stack/material/cardboard