Merge branch 'development' into datacore

Author: Karolis2011

.github/CODEOWNERS

@@ -6,7 +6,7 @@
 # If you are added, then you are expected to review PRs in a timely manner.
 
 /code/world.dm @Arrow768
-/code/controllers/subsystems/supply.dm @Arrow768
+/code/controllers/subsystems/cargo.dm @Arrow768
 /code/datums/api.dm @Arrow768
 /code/datums/cargo.dm @Arrow768
 /code/datums/server_greeting.dm @Skull132
@@ -18,6 +18,7 @@
 /code/modules/item_worth/ @Arrow768
 /code/modules/modular_computers/ @Arrow768
 /code/modules/telesci/ @Arrow768
+/code/modules/cargo/ @Arrow768
 /code/modules/udp/ @Arrow768
 /code/modules/vueui/ @Karolis2011
 /code/modules/web_interface/ @Arrow768

.travis.yml

@@ -61,6 +61,7 @@ jobs:
   include:
     - stage: code check
       install:
+        - chmod +x ./vueui/install
         - ./vueui/install
       script:
         - (! grep 'step_[xy]' maps/**/*.dmm)
@@ -73,4 +74,4 @@ jobs:
         - awk -f tools/indentation.awk **/*.dm
         - md5sum -c - <<< "94c0d540b3b0f008fbc4353e667de690 *html/changelogs/example.yml"
         - md5sum -c - <<< "51704c822012212faa577079db2e11fd *vueui/template.html"
-        - python tools/TagMatcher/tag-matcher.py ../..
+        - python tools/TagMatcher/tag-matcher.py ../..

aurorastation.dme

@@ -153,6 +153,7 @@
 #include "code\controllers\subsystems\ao.dm"
 #include "code\controllers\subsystems\arrivals.dm"
 #include "code\controllers\subsystems\assets.dm"
+#include "code\controllers\subsystems\cargo.dm"
 #include "code\controllers\subsystems\chemistry.dm"
 #include "code\controllers\subsystems\effects.dm"
 #include "code\controllers\subsystems\emergency_shuttle.dm"
@@ -185,7 +186,6 @@
 #include "code\controllers\subsystems\statistics.dm"
 #include "code\controllers\subsystems\sun.dm"
 #include "code\controllers\subsystems\sunlight.dm"
-#include "code\controllers\subsystems\supply.dm"
 #include "code\controllers\subsystems\ticker.dm"
 #include "code\controllers\subsystems\timer.dm"
 #include "code\controllers\subsystems\trade.dm"
@@ -1139,7 +1139,30 @@
 #include "code\modules\awaymissions\trigger.dm"
 #include "code\modules\awaymissions\zlevel.dm"
 #include "code\modules\blob\blob.dm"
+#include "code\modules\cargo\bounty.dm"
+#include "code\modules\cargo\export_scanner.dm"
+#include "code\modules\cargo\exports.dm"
 #include "code\modules\cargo\randomstock.dm"
+#include "code\modules\cargo\bounties\assistant.dm"
+#include "code\modules\cargo\bounties\bot.dm"
+#include "code\modules\cargo\bounties\chef.dm"
+#include "code\modules\cargo\bounties\item.dm"
+#include "code\modules\cargo\bounties\mech.dm"
+#include "code\modules\cargo\bounties\reagent.dm"
+#include "code\modules\cargo\bounties\science.dm"
+#include "code\modules\cargo\bounties\security.dm"
+#include "code\modules\cargo\bounties\slime.dm"
+#include "code\modules\cargo\bounties\special.dm"
+#include "code\modules\cargo\bounties\virus.dm"
+#include "code\modules\cargo\bounties\weapon_prototype.dm"
+#include "code\modules\cargo\exports\gear.dm"
+#include "code\modules\cargo\exports\large_objects.dm"
+#include "code\modules\cargo\exports\materials.dm"
+#include "code\modules\cargo\exports\parts.dm"
+#include "code\modules\cargo\exports\seeds.dm"
+#include "code\modules\cargo\exports\sheets.dm"
+#include "code\modules\cargo\exports\tools.dm"
+#include "code\modules\cargo\exports\weapons.dm"
 #include "code\modules\cciaa\cciaa.dm"
 #include "code\modules\cciaa\cciaa_items.dm"
 #include "code\modules\cciaa\ert_cmd.dm"

code/ATMOSPHERICS/pipes.dm

@@ -5,7 +5,7 @@
 	var/volume = 0
 	force = 20
 
-	layer = 2.4 //under wires with their 2.44
+	layer = PIPE_LAYER
 	use_power = 0
 
 	var/alert_pressure = 80*ONE_ATMOSPHERE

code/ZAS/Fire.dm

@@ -95,6 +95,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 	return 0
 
 /turf/simulated/create_fire(fl)
+
 	if(fire)
 		fire.firelevel = max(fl, fire.firelevel)
 		return 1
@@ -111,6 +112,11 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 	if(fuel) 
 		LAZYADD(zone.fuel_objs, fuel)
 
+	var/obj/effect/decal/cleanable/foam/extinguisher_foam = locate() in src
+	if(extinguisher_foam && extinguisher_foam.reagents)
+		fire.firelevel *= max(0,1 - (extinguisher_foam.reagents.total_volume*0.04))
+		//25 units will eliminate the fire completely
+
 	return 0
 
 /obj/fire

code/__defines/_layers.dm

@@ -7,6 +7,9 @@
 #define LOWER_ON_TURF_LAYER (TURF_LAYER + 0.05)	// under the below
 #define ON_TURF_LAYER (TURF_LAYER + 0.1)	// sitting on the turf - should be preferred over direct use of TURF_LAYER
 #define AO_LAYER (ON_TURF_LAYER + 0.1)
+#define PIPE_LAYER 2.4 //under wires with their 2.44
+#define CABLE_LAYER 2.44
+#define ABOVE_CABLE_LAYER (CABLE_LAYER + 0.1)
 #define DOOR_OPEN_LAYER 2.7		//Under all objects if opened. 2.7 due to tables being at 2.6
 #define UNDERDOOR 3.09		//Just barely under a closed door.
 #define DOOR_CLOSED_LAYER 3.1	//Above most items if closed

code/__defines/chemistry.dm

@@ -5,6 +5,10 @@
 #define CHEM_BLOOD 3
 #define CHEM_BREATHE 4
 
+#define WET_TYPE_WATER 1
+#define WET_TYPE_LUBE 2
+#define WET_TYPE_ICE 3
+
 #define MINIMUM_CHEMICAL_VOLUME 0.01
 
 #define SOLID 1

code/__defines/items_clothing.dm

@@ -23,13 +23,13 @@
 #define SLOT_HOLSTER	0x8000 //16th bit - higher than this will overflow
 
 // Flags bitmasks.
-#define NOBLUDGEON         0x1    // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
+#define NOBLUDGEON         0x1   // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
 #define CONDUCT            0x2   // Conducts electricity. (metal etc.)
 #define ON_BORDER          0x4   // Item has priority to check when entering or leaving.
 #define NOBLOODY           0x8   // Used for items if they don't want to get a blood overlay.
-#define OPENCONTAINER      0x10 // Is an open container for chemistry purposes.
-#define PHORONGUARD        0x20 // Does not get contaminated by phoron.
-#define	NOREACT            0x40 // Reagents don't react inside this container.
+#define OPENCONTAINER      0x10  // Is an open container for chemistry purposes.
+#define PHORONGUARD        0x20  // Does not get contaminated by phoron.
+#define NOREACT            0x40  // Reagents don't react inside this container.
 #define PROXMOVE           0x80  // Does this object require proximity checking in Enter()?
 
 //Flags for items (equipment)

code/__defines/math_physics.dm

@@ -1,5 +1,6 @@
 // Math constants.
 #define M_PI 3.14159
+#define NUM_E 2.71828183
 
 #define R_IDEAL_GAS_EQUATION       8.31    // kPa*L/(K*mol).
 #define ONE_ATMOSPHERE             101.325 // kPa.

code/controllers/subsystems/supply.dm code/controllers/subsystems/cargo.dm

@@ -39,11 +39,16 @@ var/datum/controller/subsystem/cargo/SScargo
 
 	//shuttle movement
 	var/movetime = 1200
+	var/min_movetime = 1200
 	var/datum/shuttle/ferry/supply/shuttle
 
 	//Item vars
 	var/last_item_id = 0 //The ID of the last item that has been added
 
+	//Exports and bounties
+	var/list/exports_list = list()
+	var/list/bounties_list = list()
+
 /datum/controller/subsystem/cargo/Recover()
 	src.shuttle = SScargo.shuttle
 	src.cargo_items = SScargo.cargo_items
@@ -54,6 +59,8 @@ var/datum/controller/subsystem/cargo/SScargo
 	src.cargo_handlingfee_change = SScargo.cargo_handlingfee_change
 	src.supply_account = SScargo.supply_account
 	src.last_item_id = SScargo.last_item_id
+	src.exports_list = SScargo.exports_list
+	src.bounties_list = SScargo.bounties_list
 
 /datum/controller/subsystem/cargo/Initialize(timeofday)
 	//Generate the ordernumber and shipmentnumber to start with
@@ -73,6 +80,10 @@ var/datum/controller/subsystem/cargo/SScargo
 	else
 		log_game("SScargo: invalid load option specified in config")
 
+	setupExports()
+	setupBounties()
+
+	//Spawn in the warehouse crap
 	var/datum/cargospawner/spawner = new
 	spawner.start()
 	qdel(spawner)
@@ -201,7 +212,6 @@ var/datum/controller/subsystem/cargo/SScargo
 					item_query.item[11])
 			catch(var/exception/ei)
 				log_debug("SScargo: Error when loading item from sql: [ei]")
-		return 1
 
 //Loads the cargo data from JSON
 /datum/controller/subsystem/cargo/proc/load_from_json()
@@ -555,7 +565,7 @@ var/datum/controller/subsystem/cargo/SScargo
 		if (shuttle.forbidden_atoms_check())
 			. = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons."
 		else
-			movetime = 1200 //It always takes two minutes to get to centcom
+			movetime = min_movetime //It always takes two minutes to get to centcom
 			shuttle.launch(src)
 			. = "Initiating launch sequence"
 			current_shipment.shuttle_recalled_by = caller_name
@@ -573,9 +583,9 @@ var/datum/controller/subsystem/cargo/SScargo
 			current_shipment.shuttle_time = get_pending_shipment_time()
 			current_shipment.shuttle_fee = shipment_cost
 
-			if(current_shipment.shuttle_time < 1200)
-				log_debug("SScargo: Shuttle Time less than 1200: [current_shipment.shuttle_time] - Setting to 1200")
-				current_shipment.shuttle_time = 1200
+			if(current_shipment.shuttle_time < min_movetime)
+				log_debug("SScargo: Shuttle Time less than [min_movetime]: [current_shipment.shuttle_time] - Setting to [min_movetime]")
+				current_shipment.shuttle_time = min_movetime
 
 			movetime = current_shipment.shuttle_time
 			//Launch it
@@ -609,39 +619,39 @@ var/datum/controller/subsystem/cargo/SScargo
 
 //Sells stuff on the shuttle to centcom
 /datum/controller/subsystem/cargo/proc/sell()
-	//TODO-CARGO: Only pay for specific stuff on the shuttle and not for everything else - Charge a cleanup fee for the rest
 	var/area/area_shuttle = shuttle.get_location_area()
 	if(!area_shuttle)	return
 
-	var/phoron_count = 0
-	var/plat_count = 0
+	var/msg = ""
+	var/matched_bounty = FALSE
+	var/sold_atoms = ""
 
-	for(var/atom/movable/MA in area_shuttle)
-		if(MA.anchored)	continue
+	for(var/place in area_shuttle)
+		var/area/shuttle/shuttle_area = place
+		for(var/atom/movable/AM in shuttle_area)
+			if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
+				matched_bounty = TRUE
+			if(!AM.anchored || istype(AM, /obj/mecha))
+				sold_atoms += export_item_and_contents(AM, FALSE, FALSE, dry_run = FALSE)
 
-		// Must be in a crate!
-		if(istype(MA,/obj/structure/closet/crate))
-			callHook("sell_crate", list(MA, area_shuttle))
+	if(sold_atoms)
+		sold_atoms += "."
 
-			current_shipment.shipment_cost_sell += credits_per_crate
+	if(matched_bounty)
+		msg += "Bounty items received. An update has been sent to all bounty consoles.\n"
 
-			for(var/atom in MA)
-				var/atom/A = atom
-				// Sell phoron and platinum
-				if(istype(A, /obj/item/stack))
-					var/obj/item/stack/P = A
-					switch(P.get_material_name())
-						if("phoron") phoron_count += P.get_amount()
-						if("platinum") plat_count += P.get_amount()
-		qdel(MA)
-
-	if(phoron_count)
-		current_shipment.shipment_cost_sell += phoron_count * credits_per_phoron
+	for(var/a in exports_list)
+		var/datum/export/E = a
+		var/export_text = E.total_printout()
+		if(!export_text)
+			continue
 
-	if(plat_count)
-		current_shipment.shipment_cost_sell += plat_count * credits_per_platinum
+		msg += export_text + "\n"
+		current_shipment.shipment_cost_sell += E.total_cost
+		E.export_end()
 
 	charge_cargo("Shipment #[current_shipment.shipment_num] - Income", -current_shipment.shipment_cost_sell)
+	current_shipment.message = msg
 	current_shipment.generate_invoice()
 	current_shipment = null //Null the current shipment because its completed
 

code/datums/cargo.dm

@@ -334,7 +334,10 @@
 // Returns a Invoice for the Order
 /datum/cargo_order/proc/get_report_invoice()
 	var/list/order_data = list()
-	order_data += "<h4>Invoice #[order_id]</h4>"
+	var/invoice_type = "Preliminary"
+	if(status == "delivered" && paid_by)
+		invoice_type = "Final"
+	order_data += "<h4>[invoice_type] Invoice #[order_id]</h4>"
 	order_data += "<hr>"
 	//List the personell involved in the order
 	order_data += "<u>Ordered by:</u> [ordered_by]<br>"
@@ -482,6 +485,7 @@
 	var/shuttle_called_by //The person that called the shuttle
 	var/shuttle_recalled_by //The person that recalled the shuttle
 	var/completed = 0
+	var/message = null //Message from central
 
 /datum/cargo_shipment/proc/get_list(var/shipment_completion = 1)
 	if(shipment_completion != completed)
@@ -512,6 +516,7 @@
 	invoice_data += "shuttle time: [shuttle_time]<br>"
 	invoice_data += "shuttle called by: [shuttle_called_by]<br>"
 	invoice_data += "shuttle recalled by: [shuttle_recalled_by]<br>"
+	invoice_data += "centcom message:<br>[nl2br(message)]"
 
 	shipment_invoice = invoice_data.Join("")
 	completed = 1

code/datums/diseases/advance/advance.dm

@@ -38,6 +38,7 @@ var/list/advance_cures = 	list(
 	// NEW VARS
 
 	var/list/symptoms = list() // The symptoms of the disease.
+	var/list/properties = list() // List of properties
 	var/id = ""
 	var/processing = 0
 
@@ -168,7 +169,7 @@ var/list/advance_cures = 	list(
 
 /datum/disease/advance/proc/Refresh(var/new_name = 0)
 	//world << "[src.name] \ref[src] - REFRESH!"
-	var/list/properties = GenerateProperties()
+	GenerateProperties()
 	AssignProperties(properties)
 
 	if(!archive_diseases[GetDiseaseID()])
@@ -187,8 +188,6 @@ var/list/advance_cures = 	list(
 		CRASH("We did not have any symptoms before generating properties.")
 		return
 
-	var/list/properties = list("resistance" = 1, "stealth" = 1, "stage_rate" = 1, "transmittable" = 1, "severity" = 1)
-
 	for(var/datum/symptom/S in symptoms)
 
 		properties["resistance"] += S.resistance
@@ -197,8 +196,6 @@ var/list/advance_cures = 	list(
 		properties["transmittable"] += S.transmittable
 		properties["severity"] = max(properties["severity"], S.level) // severity is based on the highest level symptom
 
-	return properties
-
 // Assign the properties that are in the list.
 /datum/disease/advance/proc/AssignProperties(var/list/properties = list())
 
@@ -413,6 +410,18 @@ var/list/advance_cures = 	list(
 			name_symptoms += S.name
 		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
 
+/datum/disease/advance/proc/totalStageSpeed()
+	return properties["stage_rate"]
+
+/datum/disease/advance/proc/totalStealth()
+	return properties["stealth"]
+
+/datum/disease/advance/proc/totalResistance()
+	return properties["resistance"]
+
+/datum/disease/advance/proc/totalTransmittable()
+	return properties["transmittable"]
+
 /*
 /mob/verb/test()