Merge branch 'master' into mapsyncs43293845982

2018-01-08 06:18:11 +00:00
parent e39ae49a2e 2d63c57837
commit e4410a3320
35 changed files with 269 additions and 142 deletions
@@ -20,6 +20,8 @@ GLOBAL_LIST(uplink_purchase_logs_by_key)	//assoc key = /datum/uplink_purchase_lo
 /datum/uplink_purchase_log/Destroy()
 	purchase_log = null
 	parent = null
+	if(GLOB.uplink_purchase_logs_by_key[owner] == src)
+		GLOB.uplink_purchase_logs_by_key -= owner
 	return ..()

 /datum/uplink_purchase_log/proc/MergeWithAndDel(datum/uplink_purchase_log/other)