From 551df1bb9704fbc36839d933a21befc7b9229e45 Mon Sep 17 00:00:00 2001 From: Karolis2011 Date: Tue, 24 Nov 2015 11:50:25 +0200 Subject: [PATCH] Few Fixes Made destination tagger window bigger. Added user checks. --- code/modules/recycling/conveyor2.dm | 4 ++-- code/modules/recycling/sortingmachinery.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index d3112837566..2f49b7b0842 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -284,7 +284,7 @@ id = C.id /obj/item/conveyor_construct/afterattack(atom/A, mob/user, proximity) - if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle)) + if(!proximity || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle) || user.incapacitated()) return var/cdir = get_dir(A, user) if(!(cdir in cardinal) || A == user.loc) @@ -312,7 +312,7 @@ id = rand() //this couldn't possibly go wrong /obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity) - if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle)) + if(!proximity || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle) || user.incapacitated()) return var/found = 0 for(var/obj/machinery/conveyor/C in view()) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 54c30bdcd30..ce0c27ad958 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -343,7 +343,7 @@ dat += "
Current Selection: [currTag ? currTag : "None"]" dat += "
Enter custom location." - user << browse(dat, "window=destTagScreen;size=450x365") + user << browse(dat, "window=destTagScreen;size=450x375") onclose(user, "destTagScreen") /obj/item/device/destTagger/attack_self(mob/user as mob)