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

Fixing up bed icons etc.

Browse Source
This commit is contained in:
Zuhayr
2015-05-30 01:13:11 +09:30
parent 93aaa48cd8
commit 3cf0018fb8
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+6 -6
View File
@@ -32,9 +32,6 @@
padding_material = get_material_by_name(new_padding_material)
update_icon()
/obj/structure/bed/padded/New(var/newloc)
..(newloc,"steel","cotton")
// Reuse the cache/code from stools, todo maybe unify.
/obj/structure/bed/update_icon()
// Prep icon.
@@ -59,10 +56,10 @@
desc = initial(desc)
if(padding_material)
name = "[padding_material.display_name] [initial(name)]" //this is not perfect but it will do for now.
desc += " It's made of [material.display_name] and covered with [padding_material.display_name]."
desc += " It's made of [material.use_name] and covered with [padding_material.use_name]."
else
name = "[material.display_name] [initial(name)]"
desc += " It's made of [material.display_name]."
desc += " It's made of [material.use_name]."
/obj/structure/bed/ex_act(severity)
switch(severity)
@@ -157,7 +154,10 @@
base_icon = "psychbed"
/obj/structure/bed/psych/New(var/newloc)
..(newloc,"leather")
..(newloc,"wood","leather")
/obj/structure/bed/padded/New(var/newloc)
..(newloc,"plastic","cotton")
/obj/structure/bed/alien
name = "resting contraption"
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+3 -3
View File
@@ -30,7 +30,7 @@ var/global/list/stool_cache = list() //haha stool
update_icon()
/obj/item/weapon/stool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "leather")
..(newloc, "steel", "carpet")
/obj/item/weapon/stool/update_icon()
// Prep icon.
@@ -54,10 +54,10 @@ var/global/list/stool_cache = list() //haha stool
// Strings.
if(padding_material)
name = "[padding_material.display_name] [initial(name)]" //this is not perfect but it will do for now.
desc = "A padded stool. Apply butt. It's made of [material.display_name] and covered with [padding_material.display_name]."
desc = "A padded stool. Apply butt. It's made of [material.use_name] and covered with [padding_material.use_name]."
else
name = "[material.display_name] [initial(name)]"
desc = "A stool. Apply butt with care. It's made of [material.display_name]."
desc = "A stool. Apply butt with care. It's made of [material.use_name]."
/obj/item/weapon/stool/proc/add_padding(var/padding_type)
padding_material = get_material_by_name(padding_type)