cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-01-23 15:52:13 -05:00
parent 02d6d1932b a4763014b9
commit b20032ea25
15 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,9 +749,9 @@ var/list/name_to_material
/material/hide //TODO make different hides somewhat different among them
name = "hide"
stack_origin_tech = list(TECH_MATERIAL = 2)
stack_type = /obj/item/stack/material/animalhide/human
stack_type = /obj/item/stack/material/animalhide
door_icon_base = "wood"
icon_colour = "#833C00"
icon_colour = "#5C4831"
ignition_point = T0C+232
melting_point = T0C+300
flags = MATERIAL_PADDING
@@ -782,3 +782,8 @@ var/list/name_to_material
name = "alien hide"
stack_type = /obj/item/stack/material/animalhide/xeno
icon_colour = "#525288"
/material/hide/human
name = "human hide"
stack_type = /obj/item/stack/material/animalhide/human
icon_colour = "#833C00"