Merge branch 'pr/2'

Conflicts:
	baystation12.dme
	config/example/dbconfig.txt

code/game/jobs/job_controller.dm

@@ -414,15 +414,15 @@ var/global/datum/controller/occupations/job_master
 							H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 						if(2)
 							var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
-							new /obj/item/weapon/storage/box(BPK)
+							new /obj/item/weapon/storage/box/survival(BPK)
 							H.equip_to_slot_or_del(BPK, slot_back,1)
 						if(3)
 							var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H)
-							new /obj/item/weapon/storage/box(BPK)
+							new /obj/item/weapon/storage/box/survival(BPK)
 							H.equip_to_slot_or_del(BPK, slot_back,1)
 						if(4)
 							var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H)
-							new /obj/item/weapon/storage/box(BPK)
+							new /obj/item/weapon/storage/box/survival(BPK)
 							H.equip_to_slot_or_del(BPK, slot_back,1)
 
 		H << "<B>You are the [alt_title ? alt_title : rank].</B>"

code/game/machinery/computer/HolodeckControl.dm

@@ -231,8 +231,10 @@
 	emergencyShutdown()
 	..()
 
-
 /obj/machinery/computer/HolodeckControl/process()
+	for(var/item in holographic_items) // do this first, to make sure people don't take items out when power is down.
+		if(!(get_turf(item) in linkedholodeck))
+			derez(item, 0)
 
 	if(!..())
 		return
@@ -256,13 +258,6 @@
 				T.ex_act(3)
 				T.hotspot_expose(1000,500,1)
 
-
-		for(var/item in holographic_items)
-			if(!(get_turf(item) in linkedholodeck))
-				derez(item, 0)
-
-
-
 /obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1)
 	holographic_items.Remove(obj)
 

code/game/machinery/podmen.dm

@@ -88,7 +88,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
 		ghost = pick(candidates)
 
 	 //If we don't have a ghost or the ghost is now unplayed, we just give the harvester some seeds.
-	if(!ghost || !(ghost.ckey))
+	if(!ghost || !(ghost.ckey) || ghost.stat != 2)
 		user << "The pod has formed badly, and all you can do is salvage some of the seeds."
 		var/seed_count = 1
 

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

@@ -16,6 +16,10 @@
 			new /obj/item/weapon/storage/backpack/industrial(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
 		new /obj/item/clothing/head/hardhat/white(src)

code/game/structure/flora.dm

@@ -73,6 +73,11 @@
 	icon_state = "snowbush[rand(1, 6)]"
 	..()
 
+/obj/structure/flora/pottedplant
+	name = "potted plant"
+	icon = 'icons/obj/plants.dmi'
+	icon_state = "plant-26"
+
 //newbushes
 
 /obj/structure/flora/ausbushes