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

Merge pull request #506 from Citadel-Station-13/upstream-merge-26402

Browse Source 
[MIRROR] Prevents fultons from transporting items out of inventories
This commit is contained in:
LetterJay
2017-04-22 14:37:01 -05:00
committed by GitHub
parent 5033d39028 01f99160ad
commit 691d973871
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/fulton.dm
View File

@@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(!safe_for_living_creatures && check_for_living_mobs(A))
to_chat(user, "[src] is not safe for use with living creatures, they wouldn't survive the trip back!")
return
if(A.loc == user) // no extracting stuff you're holding
if(!isturf(A.loc)) // no extracting stuff inside other stuff
return
if(A.anchored)
return
@@ -159,10 +159,10 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
var/beacon_network = "station"
/obj/structure/extraction_point/Initialize()
. = ..()
var/area/area_name = get_area(src)
name += " ([rand(100,999)]) ([area_name.name])"
GLOB.total_extraction_beacons += src
..()
/obj/structure/extraction_point/Destroy()
GLOB.total_extraction_beacons -= src