From 4370c8c17ba3c8a87edacae4c7349b8c494fc5e7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 14 Oct 2020 12:31:27 +0200 Subject: [PATCH] [MIRROR] Fix guillotine buckling (#1299) * Fix guillotine buckling (#54357) Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com> * Fix guillotine buckling Co-authored-by: Yenwodyah Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com> --- code/game/objects/structures/guillotine.dm | 6 +- .../modules/SiliconQoL/code/_onclick.dm | 170 +++++++++--------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index f4779664e52..e5c0bcd935d 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -189,9 +189,9 @@ else return ..() -/obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE) +/obj/structure/guillotine/user_buckle_mob(mob/living/M, force = FALSE, check_loc = FALSE) if (!anchored) - to_chat(usr, "The [src] needs to be wrenched to the floor!") + to_chat(usr, "[src] needs to be wrenched to the floor!") return FALSE if (!istype(M, /mob/living/carbon/human)) @@ -202,7 +202,7 @@ to_chat(usr, "You need to raise the blade before buckling someone in!") return FALSE - return ..(M, force, FALSE) + return ..(M, force, check_loc = FALSE) //check_loc = FALSE to allow moving people in from adjacent turfs /obj/structure/guillotine/post_buckle_mob(mob/living/M) if (!istype(M, /mob/living/carbon/human)) diff --git a/modular_skyrat/modules/SiliconQoL/code/_onclick.dm b/modular_skyrat/modules/SiliconQoL/code/_onclick.dm index aaee3d40170..c7c6aa89360 100644 --- a/modular_skyrat/modules/SiliconQoL/code/_onclick.dm +++ b/modular_skyrat/modules/SiliconQoL/code/_onclick.dm @@ -1,85 +1,85 @@ -///////////////////// -/////AI Changes////// -///////////////////// -/mob/living/silicon/ai/CtrlShiftClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A - if(airlock) - airlock.AICtrlShiftClick(src) - else - A.AICtrlShiftClick(src) // End of skyrat edit - -/mob/living/silicon/ai/ShiftClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A - if(airlock) - airlock.AIShiftClick(src) - else - A.AIShiftClick(src) - A.AIExamine(A) - -/mob/living/silicon/ai/CtrlClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A - if(airlock) - airlock.AICtrlClick(src) - else - A.AICtrlClick(src) - -/mob/living/silicon/ai/AltClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A - if(airlock) - airlock.AIAltClick(src) - else - A.AIAltClick(src) - -/atom/proc/AIExamine() // Used for AI specific examines .Currently only employed to stop door examines. - usr.examinate(src) - -// Should keep all AI Examines in here in a list. -/obj/machinery/door/airlock/AIExamine() // Lets not spam the AI with door examinations - return - -/mob/living/silicon/ai/ClickOn(atom/A, params) - ..() - var/list/modifiers = params2list(params) - if(isturf(A)&&(!modifiers)) // Have to check for modifiers. - var/obj/machinery/door/firedoor/TheDoor = locate(/obj/machinery/door/firedoor) in A - if(TheDoor) - TheDoor.attack_ai(usr) - -///////////////////////// -/////Cyborg changes////// -///////////////////////// -/mob/living/silicon/robot/CtrlShiftClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit - if(airlock) - airlock.BorgCtrlShiftClick(src) - else - A.BorgCtrlShiftClick(src) - -/mob/living/silicon/robot/ShiftClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit - if(airlock) - airlock.BorgShiftClick(src) - else - A.BorgShiftClick(src) - -/mob/living/silicon/robot/CtrlClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit - if(airlock) - airlock.BorgCtrlClick(src) - else - A.BorgCtrlClick(src) // End of skyrat edit - -/mob/living/silicon/robot/AltClickOn(atom/A) - if(isturf(A)) - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit - if(airlock) - airlock.BorgAltClick(src) - else - A.BorgAltClick(src) +///////////////////// +/////AI Changes////// +///////////////////// +/mob/living/silicon/ai/CtrlShiftClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A + if(airlock) + airlock.AICtrlShiftClick(src) + else + A.AICtrlShiftClick(src) // End of skyrat edit + +/mob/living/silicon/ai/ShiftClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A + if(airlock) + airlock.AIShiftClick(src) + else + A.AIShiftClick(src) + A.AIExamine(A) + +/mob/living/silicon/ai/CtrlClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A + if(airlock) + airlock.AICtrlClick(src) + else + A.AICtrlClick(src) + +/mob/living/silicon/ai/AltClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A + if(airlock) + airlock.AIAltClick(src) + else + A.AIAltClick(src) + +/atom/proc/AIExamine() // Used for AI specific examines .Currently only employed to stop door examines. + usr.examinate(src) + +// Should keep all AI Examines in here in a list. +/obj/machinery/door/airlock/AIExamine() // Lets not spam the AI with door examinations + return + +/mob/living/silicon/ai/ClickOn(atom/A, params) + ..() + var/list/modifiers = params2list(params) + if(isturf(A)&&(!modifiers)) // Have to check for modifiers. + var/obj/machinery/door/firedoor/TheDoor = locate(/obj/machinery/door/firedoor) in A + if(TheDoor) + TheDoor.attack_ai(usr) + +///////////////////////// +/////Cyborg changes////// +///////////////////////// +/mob/living/silicon/robot/CtrlShiftClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit + if(airlock) + airlock.BorgCtrlShiftClick(src) + else + A.BorgCtrlShiftClick(src) + +/mob/living/silicon/robot/ShiftClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit + if(airlock) + airlock.BorgShiftClick(src) + else + A.BorgShiftClick(src) + +/mob/living/silicon/robot/CtrlClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit + if(airlock) + airlock.BorgCtrlClick(src) + else + A.BorgCtrlClick(src) // End of skyrat edit + +/mob/living/silicon/robot/AltClickOn(atom/A) + if(isturf(A)) + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in A // Skyrat edit + if(airlock) + airlock.BorgAltClick(src) + else + A.BorgAltClick(src)