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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-30 23:02:45 -04:00
committed by GitHub
parent da9e3383a8
commit 4a94043fe9
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/wood.dm
View File

@@ -110,18 +110,12 @@
icon_colour = "#0099cc" // Cyan-ish icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
stack_type = /obj/item/stack/material/log/sif stack_type = /obj/item/stack/material/log/sif
<<<<<<< HEAD
||||||| parent of b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc
=======
/datum/material/wood/log/hard /datum/material/wood/log/hard
name = MAT_HARDLOG name = MAT_HARDLOG
icon_colour = "#6f432a" icon_colour = "#6f432a"
stack_type = /obj/item/stack/material/log/hard stack_type = /obj/item/stack/material/log/hard
>>>>>>> b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc
//VOREStation Addition Start //VOREStation Addition Start
/datum/material/wood/stick /datum/material/wood/stick
name = "wooden stick" name = "wooden stick"