From db3e371e0b6cf1a82d3a9ab4e1bcfce5ab5393f7 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Thu, 28 Mar 2019 23:20:15 +0100 Subject: [PATCH 1/4] wrapping big objects now takes time --- code/modules/recycling/sortingmachinery.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8cf0f52d847..ee274c927da 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -177,7 +177,9 @@ var/obj/structure/closet/crate/O = target if(O.opened) return - if(use(3)) + if(amount >= 3 && do_after_once(src, 15, target = target)) + if(O.opened || !use(3)) + return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) P.icon_state = "deliverycrate" P.wrapped = O @@ -189,7 +191,9 @@ var/obj/structure/closet/O = target if(O.opened) return - if(use(3)) + if(amount >= 3 && do_after_once(src, 15, target = target)) + if(O.opened || !use(3)) + return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) P.wrapped = O P.init_welded = O.welded From b8a414a5c4ab18c0823177c2995a2d5f2af9a3cf Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Thu, 28 Mar 2019 23:26:57 +0100 Subject: [PATCH 2/4] Also welding takes time now + usr --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ code/modules/recycling/sortingmachinery.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 5be8c938f3e..a21ef0826e9 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -281,6 +281,8 @@ if(!WT.remove_fuel(0,user)) to_chat(user, "You need more welding fuel to complete this task.") return + if(!do_after_once(usr, 15, target = target )) + return welded = !welded update_icon() for(var/mob/M in viewers(src)) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ee274c927da..be8785a1cae 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -177,7 +177,7 @@ var/obj/structure/closet/crate/O = target if(O.opened) return - if(amount >= 3 && do_after_once(src, 15, target = target)) + if(amount >= 3 && do_after_once(usr, 15, target = target)) if(O.opened || !use(3)) return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) @@ -191,7 +191,7 @@ var/obj/structure/closet/O = target if(O.opened) return - if(amount >= 3 && do_after_once(src, 15, target = target)) + if(amount >= 3 && do_after_once(usr, 15, target = target)) if(O.opened || !use(3)) return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) From 591b6b093f9055d69145d40b9834b404a7721f29 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Thu, 28 Mar 2019 23:29:36 +0100 Subject: [PATCH 3/4] spacing --- code/game/objects/structures/crates_lockers/closets.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a21ef0826e9..58267d972a8 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -278,10 +278,10 @@ if(src == user.loc) to_chat(user, "You can not [welded?"unweld":"weld"] the locker from inside.") return - if(!WT.remove_fuel(0,user)) + if(!WT.remove_fuel(0, user)) to_chat(user, "You need more welding fuel to complete this task.") return - if(!do_after_once(usr, 15, target = target )) + if(!do_after_once(usr, 15, target = target)) return welded = !welded update_icon() From 7f8837723f9c282d2e77d1f25cd3c425382932d2 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 29 Mar 2019 09:05:30 +0100 Subject: [PATCH 4/4] target dun exist and user --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 58267d972a8..03b0172c959 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -281,7 +281,7 @@ if(!WT.remove_fuel(0, user)) to_chat(user, "You need more welding fuel to complete this task.") return - if(!do_after_once(usr, 15, target = target)) + if(!do_after_once(user, 15, target = src)) return welded = !welded update_icon() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index be8785a1cae..239cb71328e 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -177,7 +177,7 @@ var/obj/structure/closet/crate/O = target if(O.opened) return - if(amount >= 3 && do_after_once(usr, 15, target = target)) + if(amount >= 3 && do_after_once(user, 15, target = target)) if(O.opened || !use(3)) return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) @@ -191,7 +191,7 @@ var/obj/structure/closet/O = target if(O.opened) return - if(amount >= 3 && do_after_once(usr, 15, target = target)) + if(amount >= 3 && do_after_once(user, 15, target = target)) if(O.opened || !use(3)) return var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc))