Map upload vima

code/__defines/machinery.dm

@@ -56,11 +56,14 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 #define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
 #define NETWORK_ERT "ZeEmergencyResponseTeam"
 #define NETWORK_DEFAULT "Station"
+#define NETWORK_BAR "Saloon" //Lonestar Ed.
 #define NETWORK_MEDICAL "Medical"
 #define NETWORK_MERCENARY "MercurialNet"
 #define NETWORK_MINE "Mining Outpost"
 #define NETWORK_NORTHERN_STAR "Northern Star"
 #define NETWORK_RESEARCH "Research"
+#define NETWORK_RANCH "Food Production Ranch" //Lonestar Ed.
+#define NETWORK_GARAGE "Robotics Garage" //Lonestar Ed.
 #define NETWORK_RESEARCH_OUTPOST "Research Outpost"
 #define NETWORK_ROBOTS "Robots"
 #define NETWORK_PRISON "Prison"
@@ -165,4 +168,4 @@ if (!(DATUM.datum_flags & DF_ISPROCESSING)) {\
 // Computer login types
 #define LOGIN_TYPE_NORMAL 1
 #define LOGIN_TYPE_AI 2
-#define LOGIN_TYPE_ROBOT 3 
+#define LOGIN_TYPE_ROBOT 3

code/__defines/misc.dm

@@ -171,7 +171,9 @@
 #define DEPARTMENT_SECURITY			"Security"
 #define DEPARTMENT_ENGINEERING		"Engineering"
 #define DEPARTMENT_MEDICAL			"Medical"
-#define DEPARTMENT_RESEARCH			"Research"
+//#define DEPARTMENT_RESEARCH			"Research"
+#define DEPARTMENT_RANCH			"Ranch"	 //Lonestar Ed. dd
+#define DEPARTMENT_GARAGE			"Garage" //Lonestar Ed.
 #define DEPARTMENT_CARGO			"Cargo"
 #define DEPARTMENT_CIVILIAN			"Civilian"
 #define DEPARTMENT_PLANET			"Planetside" // I hate having this be here and not in a SC file. Hopefully someday the manifest can be rewritten to be map-agnostic.

code/datums/datacore.dm

@@ -22,7 +22,8 @@
 	var/list/sec = new()
 	var/list/eng = new()
 	var/list/med = new()
-	var/list/sci = new()
+	var/list/rch = new()
+	var/list/grg = new()
 	var/list/car = new()
 	var/list/civ = new()
 	var/list/bot = new()
@@ -72,8 +73,11 @@
 		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_MEDICAL))
 			med[name] = rank
 			department = 1
-		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_RESEARCH))
-			sci[name] = rank
+		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_RANCH))
+			rch[name] = rank
+			department = 1
+		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_GARAGE))
+			grg[name] = rank
 			department = 1
 		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO))
 			car[name] = rank
@@ -132,10 +136,15 @@
 		for(name in med)
 			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[med[name]]</td><td>[isactive[name]]</td></tr>"
 			even = !even
-	if(sci.len > 0)
-		dat += "<tr><th colspan=3>Science</th></tr>"
-		for(name in sci)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
+	if(rch.len > 0)
+		dat += "<tr><th colspan=3>Ranch</th></tr>"
+		for(name in rch)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[rch[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(grg.len > 0)
+		dat += "<tr><th colspan=3>Garage</th></tr>"
+		for(name in grg)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[grg[name]]</td><td>[isactive[name]]</td></tr>"
 			even = !even
 	if(car.len > 0)
 		dat += "<tr><th colspan=3>Cargo</th></tr>"
@@ -187,7 +196,8 @@ var/global/list/PDA_Manifest = list()
 	var/list/sec = list()
 	var/list/eng = list()
 	var/list/med = list()
-	var/list/sci = list()
+	var/list/rch = list()
+	var/list/grg = list()
 	var/list/car = list()
 	var/list/pla = list() // Planetside crew: Explorers, Pilots, S&S
 	var/list/civ = list()
@@ -226,11 +236,17 @@ var/global/list/PDA_Manifest = list()
 			if(depthead && med.len != 1)
 				med.Swap(1,med.len)
 
-		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_RESEARCH))
-			sci[++sci.len] = list("name" = name, "rank" = rank, "active" = isactive)
+		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_RANCH))
+			rch[++rch.len] = list("name" = name, "rank" = rank, "active" = isactive)
+			department = 1
+			if(depthead && rch.len != 1)
+				rch.Swap(1,rch.len)
+
+		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_GARAGE))
+			grg[++grg.len] = list("name" = name, "rank" = rank, "active" = isactive)
 			department = 1
-			if(depthead && sci.len != 1)
-				sci.Swap(1,sci.len)
+			if(depthead && grg.len != 1)
+				grg.Swap(1,grg.len)
 
 		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_PLANET))
 			pla[++pla.len] = list("name" = name, "rank" = rank, "active" = isactive)
@@ -273,7 +289,8 @@ var/global/list/PDA_Manifest = list()
 		list("cat" = "Security", "elems" = sec),
 		list("cat" = "Engineering", "elems" = eng),
 		list("cat" = "Medical", "elems" = med),
-		list("cat" = "Science", "elems" = sci),
+		list("cat" = "Ranch", "elems" = rch),
+		list("cat" = "Garage", "elems" = grg),
 		list("cat" = "Cargo", "elems" = car),
 		list("cat" = "Planetside", "elems" = pla),
 		list("cat" = "Civilian", "elems" = civ),

code/datums/outfits/jobs/cargo.dm

@@ -1,29 +1,31 @@
 /decl/hierarchy/outfit/job/cargo
 	l_ear = /obj/item/radio/headset/headset_cargo
 	hierarchy_type = /decl/hierarchy/outfit/job/cargo
-	shoes = /obj/item/clothing/shoes/boots/workboots
 
 /decl/hierarchy/outfit/job/cargo/qm
 	name = OUTFIT_JOB_NAME("Cargo")
-	uniform = /obj/item/clothing/under/rank/cargo
+	uniform = /obj/item/clothing/under/rank/cargo/jeans
+	shoes = /obj/item/clothing/shoes/brown
 	glasses = /obj/item/clothing/glasses/sunglasses
-	l_hand = /obj/item/clipboard
 	id_type = /obj/item/card/id/cargo/head
 	pda_type = /obj/item/pda/quartermaster
 
 /decl/hierarchy/outfit/job/cargo/cargo_tech
 	name = OUTFIT_JOB_NAME("Cargo technician")
-	uniform = /obj/item/clothing/under/rank/cargotech
+	uniform = /obj/item/clothing/under/rank/cargotech/jeans
 	id_type = /obj/item/card/id/cargo
 	pda_type = /obj/item/pda/cargo
 
-/decl/hierarchy/outfit/job/cargo/mining
-	name = OUTFIT_JOB_NAME("Shaft miner")
-	uniform = /obj/item/clothing/under/rank/miner{ starting_accessories=list(/obj/item/clothing/accessory/storage/overalls) }
-	l_ear = /obj/item/radio/headset/headset_mine
-	backpack = /obj/item/storage/backpack/industrial
-	satchel_one  = /obj/item/storage/backpack/satchel/eng
-	id_type = /obj/item/card/id/cargo/miner
-	pda_type = /obj/item/pda/shaftminer
-	backpack_contents = list(/obj/item/tool/crowbar = 1, /obj/item/storage/bag/ore = 1)
-	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
+/decl/hierarchy/outfit/job/cargo/pilot
+	name = OUTFIT_JOB_NAME("Delivery Pilot")
+	shoes = /obj/item/clothing/shoes/black
+	uniform = /obj/item/clothing/under/rank/cargotech/jeans
+	suit = /obj/item/clothing/suit/storage/toggle/bomber
+	gloves = /obj/item/clothing/gloves/fingerless
+	glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
+	id_slot = slot_wear_id
+	pda_slot = slot_belt
+	pda_type = /obj/item/pda/cargo // Brown looks more rugged
+	id_type = /obj/item/card/id/cargo
+	id_pda_assignment = "Delivery Pilot"
+	flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL

code/datums/outfits/jobs/civilian.dm

@@ -1,22 +1,25 @@
+//lonestar civ jobs
+//assistant/tourist
+
 /decl/hierarchy/outfit/job/assistant
 	name = OUTFIT_JOB_NAME("Assistant")
-	uniform = /obj/item/clothing/under/rank/assistant
 	id_type = /obj/item/card/id/assistant
 
 /decl/hierarchy/outfit/job/assistant/visitor
 	name = OUTFIT_JOB_NAME("Visitor")
 	id_pda_assignment = "Visitor"
-	uniform = /obj/item/clothing/under/assistantformal
+
+/decl/hierarchy/outfit/job/assistant/cityslick
+	name = OUTFIT_JOB_NAME("City Slicker")
+	id_pda_assignment = "City Slicker"
+	uniform = /obj/item/clothing/under/suit_jacket/really_black
 
 /decl/hierarchy/outfit/job/assistant/resident
 	name = OUTFIT_JOB_NAME("Resident")
 	id_pda_assignment = "Resident"
 	uniform = /obj/item/clothing/under/color/white
 
-/decl/hierarchy/outfit/job/assistant/engineering
-	name = OUTFIT_JOB_NAME("Technical Assistant")
-	id_pda_assignment = "Technical Assistant"
-	uniform = /obj/item/clothing/under/rank/assistant/engineer
+//food service
 
 /decl/hierarchy/outfit/job/service
 	l_ear = /obj/item/radio/headset/headset_service
@@ -25,7 +28,7 @@
 /decl/hierarchy/outfit/job/service/bartender
 	name = OUTFIT_JOB_NAME("Bartender")
 	uniform = /obj/item/clothing/under/rank/bartender
-	id_type = /obj/item/card/id/civilian/bartender
+	id_type = /obj/item/card/id/civilian
 	pda_type = /obj/item/pda/bar
 	backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
 
@@ -34,71 +37,81 @@
 	for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents)
 		permit.set_name(H.real_name)
 
-/decl/hierarchy/outfit/job/service/bartender/barista
-	name = OUTFIT_JOB_NAME("Barista")
-	id_pda_assignment = "Barista"
-	backpack_contents = null
+/decl/hierarchy/outfit/job/service/barman
+	name = OUTFIT_JOB_NAME("Bar Manager")
+	uniform = /obj/item/clothing/under/suit_jacket/navy
+	glasses = /obj/item/clothing/glasses/sunglasses
+	shoes = /obj/item/clothing/shoes/syndigaloshes
+	id_type = /obj/item/card/id/civilian
+	pda_type = /obj/item/pda/bar
+	backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
+
+/decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
+	..()
+	for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents)
+		permit.set_name(H.real_name)
 
 /decl/hierarchy/outfit/job/service/chef
 	name = OUTFIT_JOB_NAME("Chef")
 	uniform = /obj/item/clothing/under/rank/chef
 	suit = /obj/item/clothing/suit/chef
 	head = /obj/item/clothing/head/chefhat
-	id_type = /obj/item/card/id/civilian/chef
+	id_type = /obj/item/card/id/civilian
 	pda_type = /obj/item/pda/chef
 
 /decl/hierarchy/outfit/job/service/chef/cook
 	name = OUTFIT_JOB_NAME("Cook")
-	suit = /obj/item/clothing/suit/storage/apron/white
-	head = /obj/item/clothing/head/surgery/hairnet
 	id_pda_assignment = "Cook"
 
-/decl/hierarchy/outfit/job/service/gardener
-	name = OUTFIT_JOB_NAME("Gardener")
-	uniform = /obj/item/clothing/under/rank/hydroponics
-	suit = /obj/item/clothing/suit/storage/apron
-	gloves = /obj/item/clothing/gloves/botanic_leather
-	r_pocket = /obj/item/analyzer/plant_analyzer
-	backpack = /obj/item/storage/backpack/hydroponics
-	satchel_one = /obj/item/storage/backpack/satchel/hyd
-	messenger_bag = /obj/item/storage/backpack/messenger/hyd
-	sports_bag = /obj/item/storage/backpack/sport/hyd
-	id_type = /obj/item/card/id/civilian/botanist
-	pda_type = /obj/item/pda/botanist
+//other
+
+/decl/hierarchy/outfit/job/mining
+	name = OUTFIT_JOB_NAME("Independent Prospector")
+	uniform = /obj/item/clothing/under/rank/miner
+	shoes = /obj/item/clothing/shoes/boots/workboots
+	l_ear = /obj/item/radio/headset/headset_mine
+	backpack = /obj/item/storage/backpack/industrial
+	satchel_one  = /obj/item/storage/backpack/satchel/eng
+	id_type = /obj/item/card/id/cargo
+	pda_type = /obj/item/pda/shaftminer
+	backpack_contents = list(/obj/item/storage/bag/ore = 1)
+	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
 
 /decl/hierarchy/outfit/job/service/janitor
 	name = OUTFIT_JOB_NAME("Janitor")
 	uniform = /obj/item/clothing/under/rank/janitor
-	id_type = /obj/item/card/id/civilian/janitor
-	pda_type = /obj/item/pda/janitor
-
-/decl/hierarchy/outfit/job/librarian
-	name = OUTFIT_JOB_NAME("Librarian")
-	uniform = /obj/item/clothing/under/suit_jacket/tan
-	l_hand = /obj/item/barcodescanner
+	shoes = /obj/item/clothing/shoes/galoshes
 	id_type = /obj/item/card/id/civilian
-	pda_type = /obj/item/pda/librarian
+	pda_type = /obj/item/pda/janitor
 
-/decl/hierarchy/outfit/job/librarian/journalist
-	id_type = /obj/item/card/id/civilian/journalist
+/decl/hierarchy/outfit/job/gunsmith
+	name = OUTFIT_JOB_NAME("Gunsmith")
+	uniform = /obj/item/clothing/under/tactical
+	shoes = /obj/item/clothing/shoes/boots/cowboy
+	id_type = /obj/item/card/id/security
+	pda_type = /obj/item/pda/security
 
-/decl/hierarchy/outfit/job/internal_affairs_agent
-	name = OUTFIT_JOB_NAME("Internal affairs agent")
-	l_ear = /obj/item/radio/headset/ia
-	uniform = /obj/item/clothing/under/rank/internalaffairs
-	suit = /obj/item/clothing/suit/storage/toggle/internalaffairs
+/decl/hierarchy/outfit/job/pub_defender
+	name = OUTFIT_JOB_NAME("Public Defender")
+	uniform = /obj/item/clothing/under/lawyer/blue
 	shoes = /obj/item/clothing/shoes/brown
 	glasses = /obj/item/clothing/glasses/sunglasses/big
-	l_hand = /obj/item/clipboard
-	id_type = /obj/item/card/id/civilian/internal_affairs
+	id_type = /obj/item/card/id/civilian
 	pda_type = /obj/item/pda/lawyer
 
-/decl/hierarchy/outfit/job/chaplain
-	name = OUTFIT_JOB_NAME("Chaplain")
-	uniform = /obj/item/clothing/under/rank/chaplain
-	l_hand = /obj/item/storage/bible
-	id_type = /obj/item/card/id/civilian/chaplain
-	pda_type = /obj/item/pda/chaplain
+// unused follows:
+
+/decl/hierarchy/outfit/job/service/gardener
+	name = OUTFIT_JOB_NAME("Gardener")
+	uniform = /obj/item/clothing/under/rank/hydroponics
+	suit = /obj/item/clothing/suit/storage/apron
+	gloves = /obj/item/clothing/gloves/botanic_leather
+	r_pocket = /obj/item/analyzer/plant_analyzer
+	backpack = /obj/item/storage/backpack/hydroponics
+	satchel_one = /obj/item/storage/backpack/satchel/hyd
+	messenger_bag = /obj/item/storage/backpack/messenger/hyd
+	id_type = /obj/item/card/id/civilian
+	pda_type = /obj/item/pda/botanist
 
 /decl/hierarchy/outfit/job/explorer
 	name = OUTFIT_JOB_NAME("Explorer")
@@ -109,8 +122,8 @@
 	gloves = /obj/item/clothing/gloves/black
 	l_ear = /obj/item/radio/headset
 	id_slot = slot_wear_id
-	id_type = /obj/item/card/id/science/explorer
+	id_type = /obj/item/card/id/civilian
 	pda_slot = slot_belt
 	pda_type = /obj/item/pda/cargo // Brown looks more rugged
 	r_pocket = /obj/item/gps/explorer
-	id_pda_assignment = "Explorer"
+	id_pda_assignment = "Explorer"

code/datums/outfits/jobs/command.dm

@@ -1,9 +1,10 @@
 /decl/hierarchy/outfit/job/captain
-	name = OUTFIT_JOB_NAME("Captain")
+	name = OUTFIT_JOB_NAME("Steward")
 	glasses = /obj/item/clothing/glasses/sunglasses
-	uniform = /obj/item/clothing/under/rank/captain
+	uniform = /obj/item/clothing/under/costume/captain_fly
+	head = /obj/item/clothing/head/cowboy_hat
 	l_ear = /obj/item/radio/headset/heads/captain
-	shoes = /obj/item/clothing/shoes/brown
+	shoes = /obj/item/clothing/shoes/boots/cowboy/classic
 	backpack = /obj/item/storage/backpack/captain
 	satchel_one = /obj/item/storage/backpack/satchel/cap
 	messenger_bag = /obj/item/storage/backpack/messenger/com
@@ -24,24 +25,24 @@
 				qdel(medal)
 
 /decl/hierarchy/outfit/job/hop
-	name = OUTFIT_JOB_NAME("Head of Personnel")
-	uniform = /obj/item/clothing/under/rank/head_of_personnel
+	name = OUTFIT_JOB_NAME("Facility Manager")
 	l_ear = /obj/item/radio/headset/heads/hop
-	shoes = /obj/item/clothing/shoes/brown
-	id_type = /obj/item/card/id/silver/hop
+	shoes = /obj/item/clothing/shoes/boots/cowboy/classic
+	id_type = /obj/item/card/id/silver
 	pda_type = /obj/item/pda/heads/hop
 
+/decl/hierarchy/outfit/job/hop/pre_equip(mob/living/carbon/human/H)
+	..()
+	if(H.gender == FEMALE)
+		uniform = /obj/item/clothing/under/suit_jacket/female/skirt
+	else
+		uniform = /obj/item/clothing/under/suit_jacket/charcoal
+
 /decl/hierarchy/outfit/job/secretary
 	name = OUTFIT_JOB_NAME("Command Secretary")
 	l_ear = /obj/item/radio/headset/headset_com
-	shoes = /obj/item/clothing/shoes/brown
-	id_type = /obj/item/card/id/silver/secretary
+	uniform = /obj/item/clothing/under/rank/head_of_personnel
+	shoes = /obj/item/clothing/shoes/boots/cowboy
+	id_type = /obj/item/card/id/silver
 	pda_type = /obj/item/pda/heads
-	r_hand = /obj/item/clipboard
 
-/decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H)
-	..()
-	if(H.gender == FEMALE)
-		uniform = /obj/item/clothing/under/suit_jacket/female/skirt
-	else
-		uniform = /obj/item/clothing/under/suit_jacket/charcoal