diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index cf0e8ea1fe2..7210d919804 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -15,7 +15,7 @@ buckle_lying = 1 burn_state = FLAMMABLE burntime = 30 - parts = 2 + buildstackamount = 2 var/movable = 0 // For mobility checks /obj/structure/stool/bed/MouseDrop(atom/over_object) @@ -25,7 +25,7 @@ name = "psych bed" desc = "For prime comfort during psychiatric evaluations." icon_state = "psychbed" - parts = 5 + buildstackamount = 5 can_buckle = 1 buckle_lying = 1 @@ -34,8 +34,8 @@ icon_state = "dogbed" desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." anchored = 0 - parts = 10 - is_wooden = 1 + buildstackamount = 10 + buildstacktype = /obj/item/stack/sheet/wood /obj/structure/stool/bed/dogbed/ian name = "Ian's bed" @@ -52,7 +52,7 @@ /obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever if(M.environment_smash) - new /obj/item/stack/sheet/metal(loc) + new buildstacktype(loc, buildstackamount) qdel(src) /* 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 ca5c796bd3a..79dfbf5013e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -4,7 +4,7 @@ icon_state = "chair" buckle_lying = 0 //you sit in a chair, not lay burn_state = FIRE_PROOF - parts = 1 + buildstackamount = 1 var/propelled = 0 // Check for fire-extinguisher-driven chairs @@ -83,15 +83,15 @@ /obj/structure/stool/bed/chair/wood burn_state = FLAMMABLE burntime = 20 - parts = 3 - is_wooden = 1 + buildstackamount = 3 + buildstacktype = /obj/item/stack/sheet/wood // TODO: Special ash subtype that looks like charred chair legs /obj/structure/stool/bed/chair/wood/attack_animal(mob/living/simple_animal/user) // Snowflakey, but limited current uses. Future refactor if(user.environment_smash) user.do_attack_animation(src) visible_message("[user] smashes [src] apart!") - new /obj/item/stack/sheet/wood(loc, 3) + new buildstacktype(loc, buildstackamount) qdel(src) /obj/structure/stool/bed/chair/wood/narsie_act() @@ -114,7 +114,7 @@ color = rgb(255,255,255) burn_state = FLAMMABLE burntime = 30 - parts = 2 + buildstackamount = 2 var/image/armrest = null /obj/structure/stool/bed/chair/comfy/New() @@ -159,7 +159,7 @@ /obj/structure/stool/bed/chair/office anchored = 0 movable = 1 - parts = 5 + buildstackamount = 5 /obj/structure/stool/bed/chair/office/Bump(atom/A) ..() @@ -189,13 +189,13 @@ /obj/structure/stool/bed/chair/barber icon_state = "barber_chair" - parts = 1 + buildstackamount = 1 /obj/structure/stool/bed/chair/sofa name = "old ratty sofa" icon_state = "sofamiddle" anchored = 1 - parts = 1 + buildstackamount = 1 /obj/structure/stool/bed/chair/sofa/left icon_state = "sofaend_left" diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 87f0f3a6018..6de3c88981d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/objects.dmi' icon_state = "stool" anchored = 1.0 - var parts = 1 - var is_wooden = 0 + var/buildstackamount = 1 + var/buildstacktype = /obj/item/stack/sheet/metal /obj/structure/stool/ex_act(severity) switch(severity) @@ -14,28 +14,25 @@ return if(2.0) if(prob(70)) - new /obj/item/stack/sheet/metal(loc) + new buildstacktype(loc, buildstackamount) qdel(src) return if(3.0) if(prob(50)) - new /obj/item/stack/sheet/metal(loc) + new buildstacktype(loc, buildstackamount) qdel(src) return return /obj/structure/stool/blob_act() if(prob(75)) - new /obj/item/stack/sheet/metal(loc) + new buildstacktype(loc, buildstackamount) qdel(src) /obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) playsound(loc, W.usesound, 50, 1) - if(is_wooden) - new /obj/item/stack/sheet/wood(loc, parts) - else - new /obj/item/stack/sheet/metal(loc, parts) + new buildstacktype(loc, buildstackamount) qdel(src) /obj/structure/stool/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params, skip_fucking_stool_shit = 0)