From 3cd212502f2c31e452af86c1311b767f981d5b14 Mon Sep 17 00:00:00 2001 From: Firecage Date: Mon, 18 May 2015 23:35:19 +0200 Subject: [PATCH 1/2] Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind. --- code/game/objects/structures/janicart.dm | 1 + code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 + code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 1 + 3 files changed, 3 insertions(+) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 96b25f1c921..39b5d8a2f58 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -165,6 +165,7 @@ icon_state = "pussywagon" anchored = 0 density = 1 + pressure_resistance = 5 var/obj/item/weapon/storage/bag/trash/mybag = null var/callme = "pimpin' ride" //how do people refer to it? var/move_delay = 0 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 af9c059a8f7..dbc1f1d8afe 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -59,6 +59,7 @@ icon = 'icons/obj/rollerbed.dmi' icon_state = "down" anchored = 0 + pressure_resistance = 5 /obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M) if(M == buckled_mob) 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 829d6a6dd44..5f18a73fc94 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -127,6 +127,7 @@ /obj/structure/stool/bed/chair/office anchored = 0 + pressure_resistance = 5 /obj/structure/stool/bed/chair/office/light icon_state = "officechair_white" From bba300933a1c6331ebf2a9316c51b582aa421de6 Mon Sep 17 00:00:00 2001 From: Firecage Date: Sat, 30 May 2015 23:33:44 +0200 Subject: [PATCH 2/2] Moves the 5 pressure resistance to the base type. --- code/game/objects/structures/janicart.dm | 1 - code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 - code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 1 - code/game/objects/structures/stool_bed_chair_nest/stools.dm | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 39b5d8a2f58..96b25f1c921 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -165,7 +165,6 @@ icon_state = "pussywagon" anchored = 0 density = 1 - pressure_resistance = 5 var/obj/item/weapon/storage/bag/trash/mybag = null var/callme = "pimpin' ride" //how do people refer to it? var/move_delay = 0 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 dbc1f1d8afe..af9c059a8f7 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -59,7 +59,6 @@ icon = 'icons/obj/rollerbed.dmi' icon_state = "down" anchored = 0 - pressure_resistance = 5 /obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M) if(M == buckled_mob) 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 5f18a73fc94..829d6a6dd44 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -127,7 +127,6 @@ /obj/structure/stool/bed/chair/office anchored = 0 - pressure_resistance = 5 /obj/structure/stool/bed/chair/office/light icon_state = "officechair_white" 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 b3627ecda2c..e8315cd8df6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "stool" anchored = 1.0 - pressure_resistance = 15 + pressure_resistance = 5 /obj/structure/stool/ex_act(severity, target) switch(severity)