cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rebase onto Master for Volume Control Panel, Squash Commits

Browse Source
This commit is contained in:
Rykka
2020-08-27 19:47:38 -04:00
parent 61f7ef53c2
commit d2fb9a7691
375 changed files with 743 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/material_sheets.dm
+14 -3
View File
@@ -18,6 +18,7 @@
var/perunit = SHEET_MATERIAL_AMOUNT
var/apply_colour //temp pending icon rewrite
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
/obj/item/stack/material/New()
..()
@@ -120,6 +121,7 @@
default_type = "sandstone"
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/marble
name = "marble brick"
@@ -127,12 +129,14 @@
default_type = "marble"
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/diamond
name = "diamond"
icon_state = "sheet-diamond"
default_type = "diamond"
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/stack/material/uranium
name = "uranium"
@@ -146,6 +150,7 @@
default_type = "phoron"
no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/stack/material/plastic
name = "plastic"
@@ -342,6 +347,7 @@
default_type = MAT_WOOD
strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
/obj/item/stack/material/wood/sif
name = "alien wooden plank"
@@ -359,6 +365,7 @@
description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks."
var/plank_type = /obj/item/stack/material/wood
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
/obj/item/stack/material/log/sif
name = "alien log"
@@ -396,7 +403,8 @@
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/clothing.ogg'
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
/obj/item/stack/material/cloth/diyaab
color = "#c6ccf0"
@@ -417,7 +425,8 @@
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/box.ogg'
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
/obj/item/stack/material/snow
name = "snow"
@@ -439,7 +448,8 @@
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/clothing.ogg'
drop_sound = 'sound/items/drop/leather.ogg'
pickup_sound = 'sound/items/pickup/leather.ogg'
/obj/item/stack/material/glass
name = "glass"
@@ -447,6 +457,7 @@
default_type = "glass"
no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"