From fff4639bcafe617c27efa2166650aaecba973b8e Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Thu, 18 Feb 2016 20:29:37 -0700 Subject: [PATCH 1/4] Fixes an issue where you would plant a chair while moving hands. Sets the block chance on declaration rather then on instantiation. --- code/game/objects/structures/beds_chairs/chair.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index c8c88b19855..7657ffa39b4 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -211,6 +211,7 @@ throwforce = 10 throw_range = 3 hitsound = 'sound/items/trayhit1.ogg' + hit_reaction_chance = 50 var/origin_type = /obj/structure/chair @@ -221,16 +222,13 @@ icon_state = "[origin.icon_state]_toppled" item_state = origin.hold_icon origin_type = origin.type - hit_reaction_chance = 50 + /obj/item/chair/attack_hand(mob/user) - if(user.a_intent == "help") - user.visible_message("[user] rights \the [src.name].", "You right \the [src.name].") - plant() - else - ..() + plant(user) -/obj/item/chair/proc/plant() +/obj/item/chair/proc/plant(user) + user.visible_message("[user] rights \the [src.name].", "You right \the [name].") var/obj/structure/chair/C = new origin_type(get_turf(loc)) C.dir = dir qdel(src) From fd3557761cd2aabeef2a1bc845c346070bbccb1a Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Thu, 18 Feb 2016 20:32:00 -0700 Subject: [PATCH 2/4] Fixes the wrong proc being used. --- code/game/objects/structures/beds_chairs/chair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7657ffa39b4..92e61e63f51 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -224,7 +224,7 @@ origin_type = origin.type -/obj/item/chair/attack_hand(mob/user) +/obj/item/chair/attack_self(mob/user) plant(user) /obj/item/chair/proc/plant(user) From 4305097acebe61bf649ef4508968d8a4cf0d3667 Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Thu, 18 Feb 2016 21:56:24 -0700 Subject: [PATCH 3/4] Properly typecasts user var on place. --- code/game/objects/structures/beds_chairs/chair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 92e61e63f51..7bef7b4364d 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -227,7 +227,7 @@ /obj/item/chair/attack_self(mob/user) plant(user) -/obj/item/chair/proc/plant(user) +/obj/item/chair/proc/plant(mob/user) user.visible_message("[user] rights \the [src.name].", "You right \the [name].") var/obj/structure/chair/C = new origin_type(get_turf(loc)) C.dir = dir From 2de3fac2f494f189c94888dba2d9558a5a707787 Mon Sep 17 00:00:00 2001 From: KazeEspada Date: Fri, 19 Feb 2016 20:47:43 -0700 Subject: [PATCH 4/4] Chairs can no longer be stacked with dense items(rare) or dense structures. As well as chairs. --- code/game/objects/structures/beds_chairs/chair.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7bef7b4364d..df83e39c10a 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -228,6 +228,14 @@ plant(user) /obj/item/chair/proc/plant(mob/user) + for(var/obj/A in get_turf(loc)) + if(istype(A,/obj/structure/chair)) + user << "There is already a chair here." + return + if(A.density) + user << "There is already something here." + return + user.visible_message("[user] rights \the [src.name].", "You right \the [name].") var/obj/structure/chair/C = new origin_type(get_turf(loc)) C.dir = dir