Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor

code/datums/EPv2.dm

@@ -40,6 +40,10 @@ var/global/list/all_exonet_connections = list()
 	src.holder = holder
 	..()
 
+/datum/exonet_protocol/Destroy()
+	remove_address()
+	holder = null
+	return ..()
 
 // Proc: make_address()
 // Parameters: 1 (string - used to make into a hash that will be part of the new address)

code/datums/mixed.dm

@@ -1,34 +1,46 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-
-/datum/data
-	var/name = "data"
-	var/size = 1.0
-
-
-/datum/data/function
-	name = "function"
-	size = 2.0
-
-
-/datum/data/function/data_control
-	name = "data control"
-
-
-/datum/data/function/id_changer
-	name = "id changer"
-
-
-/datum/data/record
-	name = "record"
-	size = 5.0
-	var/list/fields = list(  )
-
-
-/datum/data/text
-	name = "text"
-	var/data = null
-
-
-
-/datum/debug
-	var/list/debuglist
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+/datum/data
+	var/name = "data"
+	var/size = 1.0
+
+
+/datum/data/function
+	name = "function"
+	size = 2.0
+
+
+/datum/data/function/data_control
+	name = "data control"
+
+
+/datum/data/function/id_changer
+	name = "id changer"
+
+
+/datum/data/record
+	name = "record"
+	size = 5.0
+	var/list/fields = list(  )
+
+// Mostly used for data_core records, but unfortuantely used some other places too.  But mostly here, so lets make a good effort.
+// TODO - Some machines/computers might be holding references to us.  Lets look into that, but at least for now lets make sure that the manifest is cleaned up.
+/datum/data/record/Destroy(var/force)
+	if(data_core.locked.Find(src))
+		if(!force)
+			crash_with("Someone tried to qdel a record that was in data_core.locked [log_info_line(src)]")
+			return QDEL_HINT_LETMELIVE
+		data_core.locked -= src
+	data_core.medical -= src
+	data_core.general -= src
+	data_core.security -= src
+	. = ..()
+
+/datum/data/text
+	name = "text"
+	var/data = null
+
+
+
+/datum/debug
+	var/list/debuglist

code/datums/outfits/jobs/cargo.dm

@@ -20,6 +20,7 @@
 /decl/hierarchy/outfit/job/cargo/mining
 	name = OUTFIT_JOB_NAME("Shaft miner")
 	uniform = /obj/item/clothing/under/rank/miner
+	l_ear = /obj/item/device/radio/headset/headset_mine
 	backpack = /obj/item/weapon/storage/backpack/industrial
 	satchel_one  = /obj/item/weapon/storage/backpack/satchel/eng
 	id_type = /obj/item/weapon/card/id/cargo/mining

code/datums/progressbar.dm

@@ -22,8 +22,10 @@
 /datum/progressbar/Destroy()
 	if (client)
 		client.images -= bar
-	qdel(bar)
-	. = ..()
+	qdel_null(bar)
+	user = null
+	client = null
+	return ..()
 
 /datum/progressbar/proc/update(progress)
 	//world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]"

code/datums/supplypacks/materials.dm

@@ -49,7 +49,7 @@
 	cost = 15
 	contains = list(
 					/obj/fiftyspawner/carpet,
-					/obj/fiftyspawner/bluecarpet
+					/obj/fiftyspawner/tealcarpet
 					)
 
 

code/datums/supplypacks/misc.dm

@@ -70,3 +70,10 @@
 	cost = 10
 	containertype = "/obj/structure/closet/crate"
 	containername = "Webbing crate"
+
+/datum/supply_packs/misc/holoplant
+	name = "Holoplant Pot"
+	contains = list()
+	cost = 15
+	containertype = /obj/machinery/holoplant/shipped
+	containername = "holoplant"