From e0cbf33bdeb1b04f794cfff6f117a08c61c4cf3a Mon Sep 17 00:00:00 2001
From: NanakoAC <nanakoglasgow@gmail.com>
Date: Sat, 29 Oct 2016 23:14:12 +0100
Subject: [PATCH] Cargo Fixes (#1087)

Fixes several problems and runtime errors related to spawning cargo stock and loot crates
---
 code/game/objects/items/weapons/storage/boxes.dm      |  4 +++-
 code/game/objects/structures.dm                       |  1 +
 code/game/objects/structures/crates_lockers/crates.dm | 11 ++++++++---
 code/modules/cargo/randomstock.dm                     | 10 +++++-----
 code/modules/mob/freelook/update_triggers.dm          |  3 ---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 43eab1ca06a..92a577a5502 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -715,6 +715,7 @@
 	for (var/i = 0,i<6,i++)
 		var/type = pick(utensils)
 		new type(src)
+	..()
 
 
 
@@ -748,4 +749,5 @@
 	)
 	for (var/i = 0,i<7,i++)
 		var/type = pick(snacks)
-		new type(src)
\ No newline at end of file
+		new type(src)
+	..()
\ No newline at end of file
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index f344758b491..1d0eb918649 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -55,6 +55,7 @@
 
 /obj/structure/New()
 	..()
+	updateVisibility(src)
 	if(climbable)
 		verbs += /obj/structure/proc/climb_on
 
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index a0f9348b8c9..6736f5352d3 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -551,10 +551,15 @@
 		"largemetal" = "largemetalopen",
 		"medicalcrate" = "medicalcrateopen")
 
-/obj/structure/closet/crate/loot/New(var/location, var/rarity = 1, var/quantity = 10)
+
+/obj/structure/closet/crate/loot/New(var/location, var/_rarity = 1, var/_quantity = 10)
+
+	rarity = _rarity
+	quantity = _quantity
 	..(location)
-	rarity = rarity
-	quantity = quantity
+
+
+/obj/structure/closet/crate/loot/initialize()
 	spawntypes = list("1" = STOCK_RARE_PROB*rarity, "2" = STOCK_UNCOMMON_PROB*rarity, "3" = (100 - ((STOCK_RARE_PROB*rarity) + (STOCK_UNCOMMON_PROB*rarity))))
 
 	icon_closed = pick(iconchoices)
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index 059a67c8b48..6a1cb57d114 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -1305,8 +1305,8 @@ var/list/global/random_stock_large = list(
 		//with some of the more overpowered ones excluded
 		if ("exoquip")
 			var/list/equips = list(
-			"/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp," = 1,
-			"/obj/item/mecha_parts/mecha_equipment/tool/drill," = 1,
+			"/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp" = 1,
+			"/obj/item/mecha_parts/mecha_equipment/tool/drill" = 1,
 			"/obj/item/mecha_parts/mecha_equipment/tool/extinguisher" = 1,
 			"/obj/item/mecha_parts/mecha_equipment/gravcatapult" = 0.8,
 			"/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster" = 1,
@@ -1484,9 +1484,9 @@ var/list/global/random_stock_large = list(
 		//Several random non-weapon exosuit attachments
 		if ("exogear")
 			var/list/equips = list(
-			"/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp," = 1,
-			"/obj/item/mecha_parts/mecha_equipment/tool/drill," = 1,
-			"/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill," = 0.7,
+			"/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp" = 1,
+			"/obj/item/mecha_parts/mecha_equipment/tool/drill" = 1,
+			"/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill" = 0.7,
 			"/obj/item/mecha_parts/mecha_equipment/tool/extinguisher" = 1,
 			"/obj/item/mecha_parts/mecha_equipment/tool/rcd" = 0.08,
 			"/obj/item/mecha_parts/mecha_equipment/teleporter" = 0.3,
diff --git a/code/modules/mob/freelook/update_triggers.dm b/code/modules/mob/freelook/update_triggers.dm
index 405e4bdd9e5..838c99733b9 100644
--- a/code/modules/mob/freelook/update_triggers.dm
+++ b/code/modules/mob/freelook/update_triggers.dm
@@ -28,9 +28,6 @@
 	updateVisibility(src)
 	..()
 
-/obj/structure/New()
-	updateVisibility(src)
-
 // EFFECTS
 
 /obj/effect/Destroy()