cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Few Fixes

Browse Source 
Made destination tagger window bigger.
Added user checks.
This commit is contained in:
Karolis2011
2015-11-24 11:50:25 +02:00
parent 70245abe20
commit 551df1bb97
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+2 -2
View File
@@ -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())
code/modules/recycling/sortingmachinery.dm
+1 -1
View File
@@ -343,7 +343,7 @@
dat += "</tr></table><br>Current Selection: [currTag ? currTag : "None"]</tt>"
dat += "<br><a href='?src=\ref[src];nextTag=CUSTOM'>Enter custom location.</a>"
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)