cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-14 23:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

New chairs and recipes!

Browse Source 
New chairs and recipes!
This commit is contained in:
QuoteFox
2021-01-21 01:20:12 +00:00
parent e79656c1ba
commit 75eb4d5696
6 changed files with 155 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -20,8 +20,11 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe_list("seats", \
list( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dark chair", /obj/structure/chair/dark, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("folding chair", /obj/structure/chair/foldingchair, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("mounted chair", /obj/structure/chair/mountchair, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
null, \
new/datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE), \
@@ -30,6 +33,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("black comfy chair", /obj/structure/chair/comfy/black, 2, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("brown comfy chair", /obj/structure/chair/comfy/brown, 2, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("blue comfy chair", /obj/structure/chair/comfy/blue, 2, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_floor = TRUE) \
)), \
//CIT CHANGE - adds sofas to metal recipe list

56
code/game/objects/structures/beds_chairs/chair.dm
View File

@@ -13,6 +13,37 @@
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
layer = OBJ_LAYER
color = "#cccccc"
var/paddingcolor = ""
var/mutable_appearance/lower
/obj/structure/chair/Initialize() // for the part we sit ontop of
lower = GetLower() //if the chair has a lower part.
lower.layer = TABLE_LAYER
add_overlay(lower)
return ..()
/obj/structure/chair/proc/GetLower()
return mutable_appearance('icons/obj/chairs.dmi', "[icon_state]_lower")
/obj/structure/chair/dark
color = "#6b6b6b"
/obj/structure/chair/foldingchair
name = "folding chair"
desc = "A collapsible folding chair."
icon = 'icons/obj/chairs.dmi'
icon_state = "chair_fold"
color = "#ffffff"
item_chair = ""
/obj/structure/chair/mountchair
name = "mounted chair"
desc = "A chair mounted to the floor, this aint going anywhere!"
icon = 'icons/obj/chairs.dmi'
icon_state = "mounted_chair"
color = "#ffffff"
item_chair = ""
/obj/structure/chair/examine(mob/user)
. = ..()
@@ -150,8 +181,17 @@
buildstackamount = 2
item_chair = null
var/mutable_appearance/armrest
var/mutable_appearance/padding
paddingcolor = "#e82d2d"
/obj/structure/chair/comfy/Initialize()
padding = GetPadding()
padding.layer = BELOW_MOB_LAYER
padding.color = paddingcolor
add_overlay(padding)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
@@ -159,6 +199,9 @@
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
/obj/structure/chair/comfy/proc/GetPadding()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_padding")
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
return ..()
@@ -178,19 +221,22 @@
update_armrest()
/obj/structure/chair/comfy/brown
color = rgb(255,113,0)
paddingcolor = rgb(255,113,0)
/obj/structure/chair/comfy/beige
color = rgb(255,253,195)
paddingcolor = rgb(255,253,195)
/obj/structure/chair/comfy/teal
color = rgb(0,255,255)
paddingcolor = rgb(0,255,255)
/obj/structure/chair/comfy/black
color = rgb(167,164,153)
paddingcolor = rgb(167,164,153)
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
paddingcolor = rgb(255,251,0)
/obj/structure/chair/comfy/blue
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/plywood
name = "plywood chair"