From 42d8cd33e0ea4d81d8bc106cb2d0b741ddf70081 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Sat, 16 Mar 2013 20:58:31 +1000
Subject: [PATCH] made fuel injectors and core gens properly start in mobile
 configs, made large crates able to hold 1 large item (machinery or structure)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 .../Cael_Aislinn/Rust/core_gen.dm             |  1 +
 .../Cael_Aislinn/Rust/fuel_injector.dm        | 10 +++--
 .../structures/crates_lockers/closets.dm      |  2 +-
 .../structures/crates_lockers/crates.dm       | 41 ++++++++++++++++---
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm
index 52ab6d043ad..438894ca865 100644
--- a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm
@@ -62,6 +62,7 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 	active_power_usage = 500	//multiplied by field strength
 	var/cached_power_avail = 0
 	directwired = 1
+	anchored = 0
 
 	var/state = 0
 	var/locked = 1
diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm
index 64e9f46535e..6d18b71f4cb 100644
--- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm
@@ -3,17 +3,19 @@
 	name = "Fuel Injector"
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "injector0"
+
 	density = 1
-	var/state = 2
+	anchored = 0
+	var/state = 0
 	var/locked = 0
+	req_access = list(access_engine)
+
 	var/obj/item/weapon/fuel_assembly/cur_assembly
 	var/fuel_usage = 0.0001			//percentage of available fuel to use per cycle
 	var/id_tag = "One"
 	var/injecting = 0
 	var/trying_to_swap_fuel = 0
-	//
-	req_access = list(access_engine)
-	//
+
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 500
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 38662ddcf52..48c13eb8499 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -46,7 +46,7 @@
 	for(var/obj/effect/dummy/chameleon/AD in src)
 		AD.loc = src.loc
 
-	for(var/obj/item/I in src)
+	for(var/obj/I in src)
 		I.loc = src.loc
 
 	for(var/mob/M in src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 05d8b4241b0..0026aa53165 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -175,15 +175,29 @@
 	redlight = "largemetalr"
 	greenlight = "largemetalg"
 
-/obj/structure/closet/crate/secure/large_reinforced
-	name = "large crate"
+/obj/structure/closet/crate/secure/large/close()
+	//we can hold up to one large item
+	var/found = 0
+	for(var/obj/structure/S in src.loc)
+		if(S == src)
+			continue
+		if(!S.anchored)
+			found = 1
+			S.loc = src
+			break
+	if(!found)
+		for(var/obj/machinery/M in src.loc)
+			if(!M.anchored)
+				M.loc = src
+				break
+	..()
+
+//fluff variant
+/obj/structure/closet/crate/secure/large/reinforced
 	desc = "A hefty, reinforced metal crate with an electronic locking system."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largermetal"
 	icon_opened = "largermetalopen"
 	icon_closed = "largermetal"
-	redlight = "largemetalr"
-	greenlight = "largemetalg"
 
 /obj/structure/closet/crate/secure
 	desc = "A secure crate."
@@ -206,6 +220,23 @@
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
 
+/obj/structure/closet/crate/large/close()
+	//we can hold up to one large item
+	var/found = 0
+	for(var/obj/structure/S in src.loc)
+		if(S == src)
+			continue
+		if(!S.anchored)
+			found = 1
+			S.loc = src
+			break
+	if(!found)
+		for(var/obj/machinery/M in src.loc)
+			if(!M.anchored)
+				M.loc = src
+				break
+	..()
+
 /obj/structure/closet/crate/hydroponics
 	name = "Hydroponics crate"
 	desc = "All you need to destroy those pesky weeds and pests."