diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index e07181d415e..7840493fb41 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -78,34 +78,35 @@ /obj/structure/bed/chair/comfy desc = "It's a chair. It looks comfy." icon_state = "comfychair_preview" + base_icon = "comfychair" build_amt = 2 -/obj/structure/bed/chair/comfy/brown/Initialize(mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_LEATHER) +/obj/structure/bed/chair/comfy/brown/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_LEATHER) -/obj/structure/bed/chair/comfy/red/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CARPET) +/obj/structure/bed/chair/comfy/red/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CARPET) -/obj/structure/bed/chair/comfy/teal/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_TEAL) +/obj/structure/bed/chair/comfy/teal/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_TEAL) -/obj/structure/bed/chair/comfy/black/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_BLACK) +/obj/structure/bed/chair/comfy/black/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_BLACK) -/obj/structure/bed/chair/comfy/green/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_GREEN) +/obj/structure/bed/chair/comfy/green/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_GREEN) -/obj/structure/bed/chair/comfy/purp/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_PURPLE) +/obj/structure/bed/chair/comfy/purp/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_PURPLE) -/obj/structure/bed/chair/comfy/blue/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_BLUE) +/obj/structure/bed/chair/comfy/blue/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_BLUE) -/obj/structure/bed/chair/comfy/beige/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_BEIGE) +/obj/structure/bed/chair/comfy/beige/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_BEIGE) -/obj/structure/bed/chair/comfy/lime/Initialize(var/mapload,var/newmaterial) - . = ..(mapload, MATERIAL_STEEL, MATERIAL_CLOTH_LIME) +/obj/structure/bed/chair/comfy/lime/New(var/newloc) + ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH_LIME) /obj/structure/bed/chair/office anchored = 0 @@ -212,8 +213,8 @@ /obj/structure/bed/chair/plastic color = "#CCCCCC" -/obj/structure/bed/chair/plastic/Initialize(mapload) - . = ..(mapload, MATERIAL_PLASTIC) +/obj/structure/bed/chair/plastic/New(var/newloc) + ..(newloc, MATERIAL_PLASTIC) /obj/structure/bed/chair/wood name = "wooden chair" @@ -229,8 +230,11 @@ return ..() +/obj/structure/bed/chair/wood/New(var/newloc) + ..(newloc, MATERIAL_WOOD) + /obj/structure/bed/chair/wood/Initialize(mapload) - . = ..(mapload, "wood") + .=..() var/image/I = image(icon, "[icon_state]_over") I.layer = FLY_LAYER add_overlay(I) @@ -299,4 +303,4 @@ if(M == buckled_mob) M.pixel_y = -6 else - M.pixel_y = initial(M.pixel_y) \ No newline at end of file + M.pixel_y = initial(M.pixel_y) diff --git a/html/changelogs/wezzy-chairfixes.yml b/html/changelogs/wezzy-chairfixes.yml new file mode 100644 index 00000000000..f4fc50615f6 --- /dev/null +++ b/html/changelogs/wezzy-chairfixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes chair materials." diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index f623017dc06..ccf651a5723 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ