Merge branch 'master' into fuckatmos

code/modules/cargo/exports/large_objects.dm

@@ -55,7 +55,6 @@
 	contents_cost = 700
 	export_types = list(/obj/structure/reagent_dispensers/beerkeg)
 
-
 /datum/export/large/pipedispenser
 	cost = 500
 	unit_name = "pipe dispenser"
@@ -122,7 +121,6 @@
 	unit_name = "packaged antimatter reactor section"
 	export_types = list(/obj/item/am_shielding_container)
 
-
 /datum/export/large/iv
 	cost = 50
 	unit_name = "iv drip"
@@ -133,3 +131,86 @@
 	unit_name = "security barrier"
 	export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security)
 
+/datum/export/large/odysseus
+	cost = 5500
+	unit_name = "working odysseus"
+	export_types = list(/obj/mecha/medical/odysseus)
+	include_subtypes = FALSE
+
+/datum/export/large/ripley
+	cost = 6500
+	unit_name = "working ripley"
+	export_types = list(/obj/mecha/working/ripley)
+	include_subtypes = FALSE
+
+/datum/export/large/firefighter
+	cost = 9000
+	unit_name = "working firefighter"
+	export_types = list(/obj/mecha/working/ripley/firefighter)
+	include_subtypes = FALSE
+
+/datum/export/large/gygax
+	cost = 19000
+	unit_name = "working gygax"
+	export_types = list(/obj/mecha/combat/gygax)
+	include_subtypes = FALSE
+
+/datum/export/large/durand
+	cost = 10000
+	unit_name = "working durand"
+	export_types = list(/obj/mecha/combat/durand)
+	include_subtypes = FALSE
+
+/datum/export/large/phazon
+	cost = 25000 //Little over half do to needing a core
+	unit_name = "working phazon"
+	export_types = list(/obj/mecha/combat/phazon)
+	include_subtypes = FALSE
+
+/datum/export/large/marauder
+	cost = 15000 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
+	unit_name = "working marauder"
+	export_types = list(/obj/mecha/combat/marauder)
+	include_subtypes = FALSE
+
+/datum/export/large/deathripley
+	cost = 8500 //Still a "Combat class" mech - Illegal tech as well! 165% "normal" boundy price.
+	unit_name = "working illegally modified"
+	export_types = list(/obj/mecha/working/ripley/deathripley)
+	include_subtypes = FALSE
+
+/datum/export/large/gygaxdark
+	cost = 28500 //Still a Combat class mech - Illegal tech as well! 150% "normal" boundy price.
+	unit_name = "working illegally modified gygax"
+	export_types = list(/obj/mecha/combat/gygax/dark)
+	include_subtypes = FALSE
+
+/datum/export/large/oldripley
+	cost = 6250 //old mech - Scrap metal ! 50% "normal" boundy price.
+	unit_name = "working miner ripley"
+	export_types = list(/obj/mecha/working/ripley/mining)
+	include_subtypes = FALSE
+
+/datum/export/large/honk
+	cost = 12000 //Still a "Combat class" mech - Comats bordem honk!
+	unit_name = "working honker"
+	export_types = list(/obj/mecha/combat/honker)
+	include_subtypes = FALSE
+
+/datum/export/large/reticence
+	cost = 12000 //Still a "Combat class" mech - Has cloking and lethal weaponds.
+	unit_name = "working reticence"
+	export_types = list(/obj/mecha/combat/reticence)
+	include_subtypes = FALSE
+
+/datum/export/large/seraph
+	cost = 25500 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
+	unit_name = "working seraph"
+	export_types = list(/obj/mecha/combat/marauder/seraph)
+	include_subtypes = FALSE
+
+/datum/export/large/mauler
+	cost = 12000 //Still a Combat class mech - CC lethal weaponds.
+	unit_name = "working legally modified marauder"
+	export_types = list(/obj/mecha/combat/marauder/mauler)
+	include_subtypes = FALSE

code/modules/cargo/packs.dm

@@ -81,6 +81,21 @@
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/emergency/radiatione_emergency
+	name = "Emergenc Radiation Protection Crate"
+	desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a few pill bottles that are able to handles radiation and the affects of the poisoning."
+	cost = 2500
+	contains = list(/obj/item/clothing/head/radiation,
+					/obj/item/clothing/head/radiation,
+					/obj/item/clothing/suit/radiation,
+					/obj/item/clothing/suit/radiation,
+					/obj/item/geiger_counter,
+					/obj/item/geiger_counter,
+					/obj/item/storage/pill_bottle/mutarad,
+					/obj/item/storage/firstaid/radbgone)
+	crate_name = "radiation protection crate"
+	crate_type = /obj/structure/closet/crate/radiation
+
 /datum/supply_pack/emergency/rcds
 	name = "Emergency RCDs"
 	desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!"
@@ -1357,6 +1372,19 @@
 					/obj/item/storage/firstaid/o2)
 	crate_name = "oxygen deprivation kit crate"
 
+/datum/supply_pack/medical/advrad
+	name = "Radiation Treatment Crate Deluxe"
+	desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pill bottle, as well as a radiation treatment deluxe pill bottle!"
+	cost = 3500
+	contains = list(/obj/item/storage/pill_bottle/antirad_plus,
+					/obj/item/storage/pill_bottle/mutarad,
+					/obj/item/storage/firstaid/radbgone,
+					/obj/item/storage/firstaid/radbgone,
+					/obj/item/geiger_counter,
+					/obj/item/geiger_counter)
+	crate_name = "radiation protection crate"
+	crate_type = /obj/structure/closet/crate/radiation
+
 /datum/supply_pack/medical/surgery
 	name = "Surgical Supplies Crate"
 	desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed."
@@ -1671,7 +1699,7 @@
 			/obj/item/t_scanner/adv_mining_scanner/lesser,
 			/obj/item/radio/headset/headset_cargo/mining,
 			/obj/item/storage/bag/ore,
-			/obj/item/clothing/suit/hooded/explorer,
+			/obj/item/clothing/suit/hooded/explorer/standard,
 			/obj/item/clothing/mask/gas/explorer)
 	crate_name = "shaft miner starter kit"
 	crate_type = /obj/structure/closet/crate/secure