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

Hard upstream sync (#6951)

Browse Source 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 16:03:18 -07:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/supply.dm
+9 -2
View File
@@ -114,18 +114,25 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
setupExports()
var/msg = ""
var/matched_bounty = FALSE
var/sold_atoms = ""
for(var/place in shuttle_areas)
var/area/shuttle/shuttle_area = place
for(var/atom/movable/AM in shuttle_area)
if(AM.anchored || iscameramob(AM))
if(iscameramob(AM))
continue
sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)
if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
matched_bounty = TRUE
if(!AM.anchored)
sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)
if(sold_atoms)
sold_atoms += "."
if(matched_bounty)
msg += "Bounty items received. An update has been sent to all bounty consoles. "
for(var/a in GLOB.exports_list)
var/datum/export/E = a
var/export_text = E.total_printout()