MINING job added, world made, moving into BETA

ACCESS ASSIGNMENT fixed, If any further access problems develop, please report. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1038 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/mining.dm

@@ -941,7 +941,82 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 
 	return
 
+/**********************Miner Lockers**************************/
 
+/obj/secure_closet/miner
+	name = "Miner's Equipment"
+	icon_state = "miningsec1"
+	icon_closed = "miningsec"
+	icon_locked = "miningsec1"
+	icon_broken = "miningsecbroken"
+	icon_off = "miningsecoff"
+	req_access = list(access_mining)
+
+/obj/secure_closet/miner/New()
+	..()
+	sleep(2)
+	new /obj/item/device/analyzer(src)
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/weapon/satchel(src)
+	new /obj/item/device/flashlight/lantern(src)
+	new /obj/item/weapon/shovel(src)
+	new /obj/item/weapon/pickaxe(src)
+
+
+/**********************Shuttle Computer**************************/
+
+var/mining_shuttle_tickstomove = 15
+var/mining_shuttle_moving = 0
+var/mining_shuttle_location = 0 // 0 = station 13, 1 = mining station
+
+proc/move_mining_shuttle()
+	if (mining_shuttle_moving)
+		return
+	mining_shuttle_moving = 1
+	spawn(mining_shuttle_tickstomove*10)
+		var/area/fromArea
+		var/area/toArea
+		if (mining_shuttle_location == 1)
+			fromArea = locate(/area/shuttle/mining/outpost)
+			toArea = locate(/area/shuttle/mining/station)
+		else
+			fromArea = locate(/area/shuttle/mining/station)
+			toArea = locate(/area/shuttle/mining/outpost)
+		fromArea.move_contents_to(toArea)
+		if (mining_shuttle_location)
+			mining_shuttle_location = 0
+		else
+			mining_shuttle_location = 1
+		mining_shuttle_moving = 0
+	return
+
+/obj/machinery/computer/mining_shuttle
+	name = "Mining Shuttle Console"
+	icon = 'computer.dmi'
+	icon_state = "shuttle"
+	req_access = list(access_mining)
+	//var/hacked = 0 TODO
+	var/location = 0 //0 = station, 1 = mining base
+
+/obj/machinery/computer/mining_shuttle/attack_hand(user as mob)
+	src.add_fingerprint(usr)
+	var/dat
+	dat = text("<b>Mining shuttle: <A href='?src=\ref[src];move=[1]'>Call</A></b>")
+	user << browse("[dat]", "window=miningshuttle;size=200x100")
+
+/obj/machinery/computer/mining_shuttle/Topic(href, href_list)
+	if(..())
+		return
+	usr.machine = src
+	src.add_fingerprint(usr)
+	if(href_list["move"])
+		if (!mining_shuttle_moving)
+			usr << "\blue shuttle called and will arrive shortly"
+			move_mining_shuttle()
+		else
+			usr << "\blue shuttle is already moving"
 
 /**********************Mine areas**************************/
 
@@ -956,9 +1031,29 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 	music = null
 
 /area/mine/lobby
-	name = "Mining station"
+	name = "Mining station Hallways"
 	icon_state = "mine"
 
+/area/mine/storage
+	name = "Mining station Storage"
+	icon_state = "green"
+
+/area/mine/production
+	name = "Mining station Production Area"
+	icon_state = "janitor"
+
+/area/mine/living_quarters
+	name = "Mining station Living Quarters"
+	icon_state = "yellow"
+
+/area/mine/eva
+	name = "Mining station EVA"
+	icon_state = "eva"
+
+/area/mine/maintenance
+	name = "Mining station Maintenance"
+	icon_state = "maintcentral"
+
 
 /**********************Mineral deposits**************************/
 
@@ -1406,7 +1501,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 /obj/ore_box
 	icon = 'mining.dmi'
 	icon_state = "orebox"
-	name = "A box of ores"
+	name = "Ore Box"
 	desc = "It's heavy"
 	density = 1
 

code/defines/global.dm

@@ -75,6 +75,7 @@ var
 
 	captainMax = 1
 	engineerMax = 5
+	minerMax = 3
 	barmanMax = 1
 	scientistMax = 3
 	chemistMax = 1

code/game/jobs/access.dm

@@ -46,7 +46,9 @@
 	access_surgery = 45
 	access_theatre = 46
 	access_research = 47
-	access_mailsorting = 48
+	access_mining = 48
+	access_mining_office = 49
+	access_mailsorting = 50
 
 /obj/var/list/req_access = null
 /obj/var/req_access_txt = "0"
@@ -160,8 +162,10 @@
 			return list(access_robotics, access_tech_storage, access_maint_tunnels)
 		if("Cargo Technician")
 			return list(access_maint_tunnels, access_cargo, access_cargo_bot)
+		if("Shaft Miner")
+			return list(access_maint_tunnels, access_mining)
 		if("Quartermaster")
-			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_qm)
+			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_office)
 		if("Chief Engineer")
 			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
@@ -186,7 +190,7 @@
 	            access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen,
 	            access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction,
 	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery,
-	            access_theatre, access_research, access_mailsorting)
+	            access_theatre, access_research, access_mining, access_mining_office, access_mailsorting)
 
 /proc/get_region_accesses(var/code)
 	switch(code)
@@ -204,8 +208,8 @@
 			return list(access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers)
 		if(6) //station general
 			return list(access_chapel_office, access_kitchen,access_bar, access_janitor, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
-		if(7) //cargo
-			return list(access_cargo, access_cargo_bot, access_qm)
+		if(7) //supply
+			return list(access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_office, access_mailsorting)
 
 /proc/get_region_accesses_name(var/code)
 	switch(code)
@@ -223,8 +227,8 @@
 			return "Command"
 		if(6) //station general
 			return "Station General"
-		if(7) //cargo
-			return "Cargo"
+		if(7) //supply
+			return "Supply"
 
 
 /proc/get_access_desc(A)
@@ -321,11 +325,15 @@
 			return "Theatre"
 		if(access_research)
 			return "Research"
+		if(access_mining)
+			return "Mining"
+		if(access_mining_office)
+			return "Mining Office"
 		if(access_mailsorting)
 			return "Delivery Office"
 
 /proc/get_all_jobs()
-	return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
+	return list("Assistant", "Station Engineer", "Shaft Miner", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
 				"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
 				"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
 				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")

code/game/jobs/jobprocs.dm

@@ -366,6 +366,13 @@
 			//src.equip_if_possible(new /obj/item/weapon/crowbar(src), slot_in_backpack) // - commented out, why would you need this when you spawn with a blue toolbox - muskets
 			src.equip_if_possible(new /obj/item/device/t_scanner(src), slot_r_store)
 
+		if ("Shaft Miner")
+			src.equip_if_possible(new /obj/item/clothing/under/color/white(src), slot_w_uniform)
+			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
+			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
+			src.equip_if_possible(new /obj/item/weapon/crowbar(src), slot_in_backpack)
+			src.equip_if_possible(new /obj/item/weapon/satchel(src), slot_r_store)
+
 		if ("Assistant")
 			src.equip_if_possible(new /obj/item/clothing/under/color/grey(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)

code/game/jobs/jobs.dm

@@ -1,5 +1,6 @@
 var/list/occupations = list(
 	"Station Engineer", "Station Engineer", "Station Engineer", "Station Engineer", "Station Engineer",
+	"Shaft Miner", "Shaft Miner", "Shaft Miner",
 	"Security Officer", "Security Officer", "Security Officer", "Security Officer", "Security Officer",
 	"Detective",
 	"Warden",

code/game/machinery/doors/airlock.dm

@@ -82,31 +82,26 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 /obj/machinery/door/airlock/command
 	name = "Airlock"
 	icon = 'Doorcom.dmi'
-	req_access = list(access_heads)
 	doortype = 1
 
 /obj/machinery/door/airlock/security
 	name = "Airlock"
 	icon = 'Doorsec.dmi'
-	req_access = list(access_security)
 	doortype = 2
 
 /obj/machinery/door/airlock/engineering
 	name = "Airlock"
 	icon = 'Dooreng.dmi'
-	req_access = list(access_engine)
 	doortype = 3
 
 /obj/machinery/door/airlock/medical
 	name = "Airlock"
 	icon = 'Doormed.dmi'
-	req_access = list(access_medical)
 	doortype = 4
 
 /obj/machinery/door/airlock/maintenance
 	name = "Maintenance Access"
 	icon = 'Doormaint.dmi'
-	req_access = list(access_maint_tunnels)
 	doortype = 5
 
 /obj/machinery/door/airlock/external

code/modules/mob/new_player/new_player.dm

@@ -231,6 +231,8 @@ mob/new_player
 					AttemptLateSpawn("Chief Medical Officer", cmoMax)
 				if ("28")
 					AttemptLateSpawn("Warden", wardenMax)
+				if ("29")
+					AttemptLateSpawn("Shaft Miner", minerMax)
 
 		if(!ready && href_list["preferences"])
 			preferences.process_link(src, href_list)
@@ -398,6 +400,8 @@ mob/new_player
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=27'>Chief Medical Officer</a><br>"
 		if (IsJobAvailable("Warden", wardenMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=28'>Warden</a><br>"
+		if (IsJobAvailable("Shaft Miner",minerMax))
+			dat += "<a href='byond://?src=\ref[src];SelectedJob=29'>Shaft Miner</a> (BETA)<br>"
 		if (!jobban_isbanned(src,"Assistant"))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=18'>Assistant</a><br>"