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

Merge pull request #701 from Darlantanis/CouchUpgrade

Browse Source 
Couch Upgrade
This commit is contained in:
Razgriz
2019-06-01 14:11:40 -07:00
committed by GitHub
parent 461f8efa7d 592aacac6e
commit 84f1bc52bc
3 changed files with 184 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+134 -2
View File
@@ -189,25 +189,157 @@
/obj/structure/bed/chair/office/dark
icon_state = "officechair_dark"
/obj/structure/bed/chair/sofa //Paradise port, feel free to add colors and the like if desired.
/obj/structure/bed/chair/oldsofa //Original Paradise port kept in the event players like these couches.
name = "sofa"
desc = "It's a couch. It looks kinda dingy."
icon_state = "sofamiddleOLD"
base_icon = "sofamiddleOLD"
applies_material_colour = 0
/obj/structure/bed/chair/oldsofa/left
icon_state = "sofaend_leftOLD"
base_icon = "sofaend_leftOLD"
/obj/structure/bed/chair/oldsofa/right
icon_state = "sofaend_rightOLD"
base_icon = "sofaend_rightOLD"
/obj/structure/bed/chair/oldsofa/corner
icon_state = "sofacornerOLD"
base_icon = "sofacornerOLD"
//Middle couch pieces.
/obj/structure/bed/chair/sofa
name = "sofa"
desc = "It's a couch. It looks comfy."
icon_state = "sofamiddle"
base_icon = "sofamiddle"
applies_material_colour = 0
/obj/structure/bed/chair/sofa/brown/New(var/newloc,var/newmaterial)
..(newloc,"steel","leather")
/obj/structure/bed/chair/sofa/red/New(var/newloc,var/newmaterial)
..(newloc,"steel","carpet")
/obj/structure/bed/chair/sofa/teal/New(var/newloc,var/newmaterial)
..(newloc,"steel","teal")
/obj/structure/bed/chair/sofa/black/New(var/newloc,var/newmaterial)
..(newloc,"steel","black")
/obj/structure/bed/chair/sofa/green/New(var/newloc,var/newmaterial)
..(newloc,"steel","green")
/obj/structure/bed/chair/sofa/purp/New(var/newloc,var/newmaterial)
..(newloc,"steel","purple")
/obj/structure/bed/chair/sofa/blue/New(var/newloc,var/newmaterial)
..(newloc,"steel","blue")
/obj/structure/bed/chair/sofa/beige/New(var/newloc,var/newmaterial)
..(newloc,"steel","beige")
/obj/structure/bed/chair/sofa/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime")
//Left couch pieces.
/obj/structure/bed/chair/sofa/left
icon_state = "sofaend_left"
base_icon = "sofaend_left"
/obj/structure/bed/chair/sofa/left/brown/New(var/newloc,var/newmaterial)
..(newloc,"steel","leather")
/obj/structure/bed/chair/sofa/left/red/New(var/newloc,var/newmaterial)
..(newloc,"steel","carpet")
/obj/structure/bed/chair/sofa/left/teal/New(var/newloc,var/newmaterial)
..(newloc,"steel","teal")
/obj/structure/bed/chair/sofa/left/black/New(var/newloc,var/newmaterial)
..(newloc,"steel","black")
/obj/structure/bed/chair/sofa/left/green/New(var/newloc,var/newmaterial)
..(newloc,"steel","green")
/obj/structure/bed/chair/sofa/left/purp/New(var/newloc,var/newmaterial)
..(newloc,"steel","purple")
/obj/structure/bed/chair/sofa/left/blue/New(var/newloc,var/newmaterial)
..(newloc,"steel","blue")
/obj/structure/bed/chair/sofa/left/beige/New(var/newloc,var/newmaterial)
..(newloc,"steel","beige")
/obj/structure/bed/chair/sofa/left/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime")
//Right couch pieces.
/obj/structure/bed/chair/sofa/right
icon_state = "sofaend_right"
base_icon = "sofaend_right"
/obj/structure/bed/chair/sofa/right/brown/New(var/newloc,var/newmaterial)
..(newloc,"steel","leather")
/obj/structure/bed/chair/sofa/right/red/New(var/newloc,var/newmaterial)
..(newloc,"steel","carpet")
/obj/structure/bed/chair/sofa/right/teal/New(var/newloc,var/newmaterial)
..(newloc,"steel","teal")
/obj/structure/bed/chair/sofa/right/black/New(var/newloc,var/newmaterial)
..(newloc,"steel","black")
/obj/structure/bed/chair/sofa/right/green/New(var/newloc,var/newmaterial)
..(newloc,"steel","green")
/obj/structure/bed/chair/sofa/right/purp/New(var/newloc,var/newmaterial)
..(newloc,"steel","purple")
/obj/structure/bed/chair/sofa/right/blue/New(var/newloc,var/newmaterial)
..(newloc,"steel","blue")
/obj/structure/bed/chair/sofa/right/beige/New(var/newloc,var/newmaterial)
..(newloc,"steel","beige")
/obj/structure/bed/chair/sofa/right/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime")
//Corner couch pieces.
/obj/structure/bed/chair/sofa/corner
icon_state = "sofacorner"
base_icon = "sofacorner"
/obj/structure/bed/chair/sofa/corner/brown/New(var/newloc,var/newmaterial)
..(newloc,"steel","leather")
/obj/structure/bed/chair/sofa/corner/red/New(var/newloc,var/newmaterial)
..(newloc,"steel","carpet")
/obj/structure/bed/chair/sofa/corner/teal/New(var/newloc,var/newmaterial)
..(newloc,"steel","teal")
/obj/structure/bed/chair/sofa/corner/black/New(var/newloc,var/newmaterial)
..(newloc,"steel","black")
/obj/structure/bed/chair/sofa/corner/green/New(var/newloc,var/newmaterial)
..(newloc,"steel","green")
/obj/structure/bed/chair/sofa/corner/purp/New(var/newloc,var/newmaterial)
..(newloc,"steel","purple")
/obj/structure/bed/chair/sofa/corner/blue/New(var/newloc,var/newmaterial)
..(newloc,"steel","blue")
/obj/structure/bed/chair/sofa/corner/beige/New(var/newloc,var/newmaterial)
..(newloc,"steel","beige")
/obj/structure/bed/chair/sofa/corner/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime")
// Chair types
/obj/structure/bed/chair/wood
name = "wooden chair"
code/modules/materials/material_recipes.dm
+50 -5
View File
@@ -46,11 +46,56 @@
new/datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("sofa", list( \
new/datum/stack_recipe("left sofa end", /obj/structure/bed/chair/sofa/left, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("middle sofa", /obj/structure/bed/chair/sofa, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("right sofa end", /obj/structure/bed/chair/sofa/right, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("corner sofa", /obj/structure/bed/chair/sofa/corner, 2, one_per_turf = 1, on_floor = 1), \
recipes += new/datum/stack_recipe_list("left sofa end", list( \
new/datum/stack_recipe("beige left sofa", /obj/structure/bed/chair/sofa/left/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black left sofa", /obj/structure/bed/chair/sofa/left/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown left sofa", /obj/structure/bed/chair/sofa/left/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime left sofa", /obj/structure/bed/chair/sofa/left/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal left sofa", /obj/structure/bed/chair/sofa/left/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red left sofa", /obj/structure/bed/chair/sofa/left/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue left sofa", /obj/structure/bed/chair/sofa/left/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple left sofa", /obj/structure/bed/chair/sofa/left/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green left sofa", /obj/structure/bed/chair/sofa/left/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("middle sofa", list( \
new/datum/stack_recipe("beige middle sofa", /obj/structure/bed/chair/sofa/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black middle sofa", /obj/structure/bed/chair/sofa/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown middle sofa", /obj/structure/bed/chair/sofa/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime middle sofa", /obj/structure/bed/chair/sofa/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal middle sofa", /obj/structure/bed/chair/sofa/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red middle sofa", /obj/structure/bed/chair/sofa/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue middle sofa", /obj/structure/bed/chair/sofa/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple middle sofa", /obj/structure/bed/chair/sofa/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green middle sofa", /obj/structure/bed/chair/sofa/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("right sofa end", list( \
new/datum/stack_recipe("beige right sofa", /obj/structure/bed/chair/sofa/right/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black right sofa", /obj/structure/bed/chair/sofa/right/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown right sofa", /obj/structure/bed/chair/sofa/right/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime right sofa", /obj/structure/bed/chair/sofa/right/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal right sofa", /obj/structure/bed/chair/sofa/right/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red right sofa", /obj/structure/bed/chair/sofa/right/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue right sofa", /obj/structure/bed/chair/sofa/right/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple right sofa", /obj/structure/bed/chair/sofa/right/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green right sofa", /obj/structure/bed/chair/sofa/right/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("corner sofa", list( \
new/datum/stack_recipe("beige corner sofa", /obj/structure/bed/chair/sofa/corner/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black corner sofa", /obj/structure/bed/chair/sofa/corner/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown corner sofa", /obj/structure/bed/chair/sofa/corner/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime corner sofa", /obj/structure/bed/chair/sofa/corner/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal corner sofa", /obj/structure/bed/chair/sofa/corner/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red corner sofa", /obj/structure/bed/chair/sofa/corner/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue corner sofa", /obj/structure/bed/chair/sofa/corner/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple corner sofa", /obj/structure/bed/chair/sofa/corner/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green corner sofa", /obj/structure/bed/chair/sofa/corner/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("old sofa", list( \
new/datum/stack_recipe("left sofa end", /obj/structure/bed/chair/oldsofa/left, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("middle sofa", /obj/structure/bed/chair/oldsofa, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("right sofa end", /obj/structure/bed/chair/oldsofa/right, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("corner sofa", /obj/structure/bed/chair/oldsofa/corner, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe("table frame", /obj/structure/table, 1, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("bench frame", /obj/structure/table/bench, 1, time = 10, one_per_turf = 1, on_floor = 1)
icons/obj/furniture_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 34 KiB