cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added MATERIAL_PADDING flag.

Browse Source
This commit is contained in:
Zuhayr
2015-05-31 17:19:32 +09:30
parent 3cf0018fb8
commit 201712eb3d
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -99,7 +99,7 @@
padding_type = "carpet" padding_type = "carpet"
else if(istype(W,/obj/item/stack/material)) else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W var/obj/item/stack/material/M = W
if(M.material && (M.material.name in list("leather", "cloth"))) if(M.material && (M.material.flags & MATERIAL_PADDING))
padding_type = "[M.material.name]" padding_type = "[M.material.name]"
if(!padding_type) if(!padding_type)
user << "You cannot pad \the [src] with that." user << "You cannot pad \the [src] with that."

2
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -126,7 +126,7 @@ var/global/list/stool_cache = list() //haha stool
padding_type = "carpet" padding_type = "carpet"
else if(istype(W,/obj/item/stack/material)) else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W var/obj/item/stack/material/M = W
if(M.material && (M.material.name in list("leather", "cloth"))) if(M.material && (M.material.flags & MATERIAL_PADDING))
padding_type = "[M.material.name]" padding_type = "[M.material.name]"
if(!padding_type) if(!padding_type)
user << "You cannot pad \the [src] with that." user << "You cannot pad \the [src] with that."

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

@@ -369,6 +369,7 @@ var/list/name_to_material
name = "cloth" name = "cloth"
stack_origin_tech = "materials=2" stack_origin_tech = "materials=2"
door_icon_base = "wood" door_icon_base = "wood"
flags = MATERIAL_PADDING
/material/cult /material/cult
name = "cult" name = "cult"
@@ -408,56 +409,66 @@ var/list/name_to_material
name = "leather" name = "leather"
icon_colour = "#5C4831" icon_colour = "#5C4831"
stack_origin_tech = "materials=2" stack_origin_tech = "materials=2"
flags = MATERIAL_PADDING
/material/carpet /material/carpet
name = "carpet" name = "carpet"
display_name = "comfy" display_name = "comfy"
use_name = "red upholstery" use_name = "red upholstery"
icon_colour = "#DA020A" icon_colour = "#DA020A"
flags = MATERIAL_PADDING
/material/cotton /material/cotton
name = "cotton" name = "cotton"
display_name ="cotton" display_name ="cotton"
icon_colour = "#FFFFFF" icon_colour = "#FFFFFF"
flags = MATERIAL_PADDING
/material/cloth_teal /material/cloth_teal
name = "teal" name = "teal"
display_name ="teal" display_name ="teal"
use_name = "teal cloth" use_name = "teal cloth"
icon_colour = "#00EAFA" icon_colour = "#00EAFA"
flags = MATERIAL_PADDING
/material/cloth_black /material/cloth_black
name = "black" name = "black"
display_name = "black" display_name = "black"
use_name = "black cloth" use_name = "black cloth"
icon_colour = "#505050" icon_colour = "#505050"
flags = MATERIAL_PADDING
/material/cloth_green /material/cloth_green
name = "green" name = "green"
display_name = "green" display_name = "green"
use_name = "green cloth" use_name = "green cloth"
icon_colour = "#01C608" icon_colour = "#01C608"
flags = MATERIAL_PADDING
/material/cloth_puple /material/cloth_puple
name = "purple" name = "purple"
display_name = "purple" display_name = "purple"
use_name = "purple cloth" use_name = "purple cloth"
icon_colour = "#9C56C4" icon_colour = "#9C56C4"
flags = MATERIAL_PADDING
/material/cloth_blue /material/cloth_blue
name = "blue" name = "blue"
display_name = "blue" display_name = "blue"
use_name = "blue cloth" use_name = "blue cloth"
icon_colour = "#6B6FE3" icon_colour = "#6B6FE3"
flags = MATERIAL_PADDING
/material/cloth_beige /material/cloth_beige
name = "beige" name = "beige"
display_name = "beige" display_name = "beige"
use_name = "beige cloth" use_name = "beige cloth"
icon_colour = "#E8E7C8" icon_colour = "#E8E7C8"
flags = MATERIAL_PADDING
/material/cloth_lime /material/cloth_lime
name = "lime" name = "lime"
display_name = "lime" display_name = "lime"
use_name = "lime cloth" use_name = "lime cloth"
icon_colour = "#62E36C" icon_colour = "#62E36C"
flags = MATERIAL_PADDING

1
code/setup.dm
View File

@@ -981,6 +981,7 @@ var/list/be_special_flags = list(
#define MATERIAL_UNMELTABLE 1 #define MATERIAL_UNMELTABLE 1
#define MATERIAL_BRITTLE 2 #define MATERIAL_BRITTLE 2
#define MATERIAL_PADDING 4
#define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass) #define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass)