Merge pull request #10422 from Kyep/depot_update_4

Depot Update

code/game/objects/effects/mines.dm

@@ -53,6 +53,15 @@
 	if(isliving(victim))
 		victim.Weaken(stun_time)
 
+/obj/effect/mine/depot
+	name = "sentry mine"
+
+/obj/effect/mine/depot/mineEffect(mob/living/victim)
+	var/area/syndicate_depot/core/depotarea = areaMaster
+	if(istype(depotarea))
+		if(depotarea.mine_triggered(victim))
+			explosion(loc, 1, 0, 0, 1) // devastate the tile you are on, but leave everything else untouched
+
 /obj/effect/mine/dnascramble
 	name = "Radiation Mine"
 	var/radiation_amount

code/game/objects/effects/spawners/random_spawners.dm

@@ -159,6 +159,7 @@
 /obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb
 	name = "50pc trap pizza"
 	result = list(/obj/item/pizzabox/meat = 1,
+		/obj/item/pizzabox/hawaiian = 1,
 		/obj/item/pizza_bomb/autoarm = 1)
 
 /obj/effect/spawner/random_spawners/syndicate/trap/medbot
@@ -169,7 +170,7 @@
 /obj/effect/spawner/random_spawners/syndicate/trap/mine
 	name = "50pc trap landmine"
 	result = list(/datum/nothing = 1,
-		/obj/effect/mine/explosive = 1)
+		/obj/effect/mine/depot = 1)
 
 /obj/effect/spawner/random_spawners/syndicate/trap/documents
 	name = "66pc trapped documents"
@@ -188,7 +189,6 @@
 	// Loot schema: costumes, toys, useless gimmick items, trapped items
 	result = list(/datum/nothing = 13,
 		/obj/item/storage/toolbox/syndicate = 1,
-		/obj/item/storage/toolbox/syndicate/trapped = 1,
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
 		/obj/item/toy/cards/deck/syndicate = 1,
 		/obj/item/storage/secure/briefcase/syndie = 1,

code/game/objects/items/devices/pizza_bomb.dm

@@ -102,4 +102,4 @@
 
 /obj/item/pizza_bomb/autoarm
 	timer_set = 1
-	timer = 10
+	timer = 30 // 3 seconds

code/game/objects/items/weapons/storage/toolbox.dm

@@ -94,16 +94,6 @@
 	new /obj/item/multitool(src)
 	new /obj/item/clothing/gloves/combat(src)
 
-
-/obj/item/storage/toolbox/syndicate/trapped
-	name = "suspicious looking toolbox"
-	desc = "Danger. Very robust. Has a small red marker by the handle."
-
-/obj/item/storage/toolbox/syndicate/trapped/New()
-	..()
-	new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
-
-
 /obj/item/storage/toolbox/drone
 	name = "mechanical toolbox"
 	icon_state = "blue"

code/game/objects/structures/crates_lockers/closets/secure/depot.dm

@@ -6,6 +6,7 @@
 	anchored = 1
 	health = 200
 	req_access = list()
+	layer = 2.9 // ensures the loot they drop always appears on top of them.
 	var/is_armory = FALSE
 	var/ignore_use = FALSE
 

code/game/objects/structures/depot.dm

@@ -9,17 +9,17 @@
 	var/area/syndicate_depot/core/depotarea
 	var/has_overloaded = FALSE
 
-/obj/structure/fusionreactor/Initialize()
-	..()
+/obj/structure/fusionreactor/New()
+	. = ..()
+	// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
 	depotarea = areaMaster
 	if(istype(depotarea))
 		depotarea.reactor = src
-	return INITIALIZE_HINT_LATELOAD
-
-/obj/structure/fusionreactor/LateInitialize()
-	for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
-		if(!istype(T.depotarea))
-			T.depotarea = depotarea
+		for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
+			if(!istype(T.depotarea))
+				T.depotarea = depotarea
+	else
+		log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
 
 /obj/structure/fusionreactor/Destroy()
 	if(istype(depotarea))
@@ -84,8 +84,9 @@
 	var/max_fire_range = 9
 	var/area/syndicate_depot/core/depotarea
 
-/obj/effect/overload/Initialize()
+/obj/effect/overload/New()
 	. = ..()
+	// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
 	processing_objects.Add(src)
 	depotarea = areaMaster
 	if(istype(depotarea))
@@ -93,6 +94,8 @@
 			depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards.
 			depotarea.updateicon()
 		depotarea.shields_down()
+	else
+		log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
 
 /obj/effect/overload/process()
 	var/turf/T = get_turf(src)
@@ -116,6 +119,8 @@
 		L.open()
 	for(var/mob/living/M in range(30, T))
 		M.gib()
+	for(var/obj/mecha/E in range(30, T))
+		E.Destroy()
 	explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0)
 	processing_objects.Remove(src)
 	qdel(src)