From 8de921832d3f00f29a3421244f6ce3d88b4d388f Mon Sep 17 00:00:00 2001 From: Incoming Date: Thu, 8 Oct 2015 03:14:06 -0400 Subject: [PATCH 1/3] Modifies plastic flaps to play nice with the secret box technique. This code is ugly, but that's mostly because of how hidiously circumstantial plastic flaps are. Always remember to use windoors with plastic flaps, as ways to get under them are still plentiful, box or no box. --- code/game/machinery/computer/shuttle.dm | 5 +++++ .../structures/crates_lockers/closets/cardboardbox.dm | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 2bb54ab86e3..532df0e4b13 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -91,6 +91,11 @@ if (istype(A, /obj/structure/stool/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 + if (istype(A, /obj/structure/closet/cardboard)) + var/obj/structure/closet/cardboard/C = A + if(C.move_delay) + return 0 + else if(istype(A, /mob/living)) // You Shall Not Pass! var/mob/living/M = A if(M.buckled && istype(M.buckled, /obj/machinery/bot/mulebot)) // mulebot passenger gets a free pass. diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index a7c46237d98..fbb9e44ee31 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -16,9 +16,11 @@ /obj/structure/closet/cardboard/relaymove(mob/user, direction) if(opened || move_delay || user.stat || user.stunned || user.weakened || user.paralysis || !isturf(loc) || !has_gravity(loc)) return - step(src, direction) move_delay = 1 - spawn(config.walk_speed) + if(step(src, direction)) + spawn(config.walk_speed) + move_delay = 0 + else move_delay = 0 /obj/structure/closet/cardboard/open() From 5b3215a6d7f53104ce63155f633b7c29c31fc164 Mon Sep 17 00:00:00 2001 From: Incoming Date: Sat, 24 Oct 2015 23:43:26 -0400 Subject: [PATCH 2/3] @memo incoming wow making sure you update to master sure is hard huh? --- code/game/objects/structures/plasticflaps.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 3d8e49f0d63..5d9d0bccb29 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -11,8 +11,8 @@ if(istype(A) && A.checkpass(PASSGLASS)) return prob(60) - var/obj/structure/stool/bed/B = A - if (istype(A, /obj/structure/stool/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass + var/obj/structure/bed/B = A + if (istype(A, /obj/structure/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 return 0 if (istype(A, /obj/structure/closet/cardboard)) @@ -28,6 +28,10 @@ return 0 return ..() +/obj/structure/plasticflaps/attackby(obj/item/weapon/W, mob/user, params) + user.changeNext_move(CLICK_CD_MELEE) + ..() + /obj/structure/plasticflaps/ex_act(severity) ..() switch(severity) @@ -55,4 +59,4 @@ if(T) if(istype(T, /turf/simulated/floor)) T.blocks_air = 0 - return ..() + return ..() \ No newline at end of file From c4af09089cd5232ab2c14ef66c43a3115280aeef Mon Sep 17 00:00:00 2001 From: Incoming5643 Date: Sat, 24 Oct 2015 23:44:22 -0400 Subject: [PATCH 3/3] no comment --- code/game/objects/structures/plasticflaps.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 5d9d0bccb29..2a695e236ae 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -12,7 +12,7 @@ return prob(60) var/obj/structure/bed/B = A - if (istype(A, /obj/structure/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 + if (istype(A, /obj/structure/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 if (istype(A, /obj/structure/closet/cardboard)) @@ -59,4 +59,4 @@ if(T) if(istype(T, /turf/simulated/floor)) T.blocks_air = 0 - return ..() \ No newline at end of file + return ..()