cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into spellcheck

Browse Source
This commit is contained in:
ShizCalev
2018-06-26 16:43:41 -04:00
committed by GitHub
parent f338f09207 87b6ca9f1a
commit 89752866aa
186 changed files with 2073 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
continue
if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
matched_bounty = TRUE
if(!AM.anchored)
if(!AM.anchored || istype(AM, /obj/mecha))
sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)
if(sold_atoms)