shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152

Browse Source 
[MIRROR] Fixes conveyor switches.
This commit is contained in:
LetterJay
2018-04-14 07:39:47 -05:00
committed by GitHub
parent 47c2bfd13c 0bc2c67af9
commit 8b2ee170bb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/recycling/conveyor2.dm
View File

@@ -348,7 +348,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/conveyor_switch_construct/Initialize()
. = ..()
id = rand() //this couldn't possibly go wrong
id = "[rand()]" //this couldn't possibly go wrong
/obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity)
if(!proximity || user.stat || !isfloorturf(A) || istype(A, /area/shuttle))