From 5bc8c45e82f745f7d32347765844d765576ab041 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 22 Feb 2017 13:41:29 +0000 Subject: [PATCH 1/6] Stops ghosts from interacting with chairs Removes the ability for ghosts to spin chairs. --- .../structures/stool_bed_chair_nest/chairs.dm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) 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 e2e287052ff..cb54ae30119 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -59,19 +59,14 @@ set category = "Object" set src in oview(1) - if(config.ghost_interaction) - src.dir = turn(src.dir, 90) - handle_rotation() + if(!usr || !isturf(usr.loc)) + return + if(usr.stat || usr.restrained()) return - else - if(!usr || !isturf(usr.loc)) - return - if(usr.stat || usr.restrained()) - return - src.dir = turn(src.dir, 90) - handle_rotation() - return + src.dir = turn(src.dir, 90) + handle_rotation() + return /obj/structure/stool/bed/chair/AltClick(mob/user) if(user.incapacitated()) From cde421e0eb322882a3b59fadd08a11a409504d9d Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 22 Feb 2017 23:07:18 +0000 Subject: [PATCH 2/6] Refactoring of the Rotate verb removes a few unnecessary checks. Still not using setDir yet, as I have yet to work out how it works. To come! --- .../structures/stool_bed_chair_nest/chairs.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 cb54ae30119..c7c22da2f50 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -59,14 +59,17 @@ set category = "Object" set src in oview(1) - if(!usr || !isturf(usr.loc)) - return - if(usr.stat || usr.restrained()) + if(config.ghost_interaction) + dir = turn(dir, 90) + handle_rotation() return + else + if(usr.incapacitated()) + return - src.dir = turn(src.dir, 90) - handle_rotation() - return + dir = turn(dir, 90) + handle_rotation() + return /obj/structure/stool/bed/chair/AltClick(mob/user) if(user.incapacitated()) From d376c1a5daf24a6876c2302f90ad4826ae388e5d Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 22 Feb 2017 23:38:43 +0000 Subject: [PATCH 3/6] Now uses setDir Tested, and didn't break anything. --- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c7c22da2f50..990dffa4073 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -60,14 +60,14 @@ set src in oview(1) if(config.ghost_interaction) - dir = turn(dir, 90) + setDir(turn(dir, 90)) handle_rotation() return else if(usr.incapacitated()) return - dir = turn(dir, 90) + setDir(turn(dir, 90)) handle_rotation() return From 79d5d7dc0c2091c5a8760b8f88547c6e2fcc9a89 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 24 Feb 2017 20:05:59 +0000 Subject: [PATCH 4/6] Removes an unnecessary 'else' statement Tidies the code up a bit more --- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 990dffa4073..5e63ad7eb53 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -63,7 +63,7 @@ setDir(turn(dir, 90)) handle_rotation() return - else + if(usr.incapacitated()) return From e1abe58da7e63ac5313fcf0709ed024601962d8c Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 24 Feb 2017 20:09:17 +0000 Subject: [PATCH 5/6] Fixes indentation --- .../objects/structures/stool_bed_chair_nest/chairs.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 5e63ad7eb53..d797454b053 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -64,13 +64,13 @@ handle_rotation() return - if(usr.incapacitated()) - return - - setDir(turn(dir, 90)) - handle_rotation() + if(usr.incapacitated()) return + setDir(turn(dir, 90)) + handle_rotation() + return + /obj/structure/stool/bed/chair/AltClick(mob/user) if(user.incapacitated()) to_chat(user, "You can't do that right now!") From 83e616d8d86a93ba47f3394c53c801fdcf88caf9 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Feb 2017 09:08:41 +0000 Subject: [PATCH 6/6] Removes a superfluous return Hopefully the final change.. --- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 1 - 1 file changed, 1 deletion(-) 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 d797454b053..301cf1c2053 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -69,7 +69,6 @@ setDir(turn(dir, 90)) handle_rotation() - return /obj/structure/stool/bed/chair/AltClick(mob/user) if(user.incapacitated())