Merge branch 'BeeStation:master' into master

beestation.dme

@@ -2849,6 +2849,7 @@
 #include "code\modules\jobs\job_types\medical_doctor.dm"
 #include "code\modules\jobs\job_types\mime.dm"
 #include "code\modules\jobs\job_types\paramedic.dm"
+#include "code\modules\jobs\job_types\posibrain.dm"
 #include "code\modules\jobs\job_types\quartermaster.dm"
 #include "code\modules\jobs\job_types\research_director.dm"
 #include "code\modules\jobs\job_types\roboticist.dm"

code/__DEFINES/jobs.dm

@@ -128,6 +128,7 @@
 // Silicon
 #define JOB_NAME_AI     "AI"
 #define JOB_NAME_CYBORG "Cyborg"
+#define JOB_NAME_POSIBRAIN "Positronic Brain"
 #define JOB_NAME_PAI    "Personal AI"
 
 // ERTs

code/__DEFINES/pipe_construction.dm

@@ -30,3 +30,160 @@
 #define STATION_TUBE_OPENING	1
 #define STATION_TUBE_CLOSED		2
 #define STATION_TUBE_CLOSING	3
+
+// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to
+// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages
+// tagged for the Cargo Bay.
+
+/* List of sortType codes for mapping reference
+0 Waste
+1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler.
+2 Cargo Bay
+3 QM Office
+4 Engineering
+5 CE Office
+6 Atmospherics
+7 Security
+8 HoS Office
+9 Medbay
+10 CMO Office
+11 Chemistry
+12 Research
+13 RD Office
+14 Robotics
+15 HoP Office
+16 Library
+17 Chapel
+18 Theatre
+19 Bar
+20 Kitchen
+21 Hydroponics
+22 Janitor
+23 Genetics
+24 Testing Range
+25 Toxins
+26 Dormitories
+27 Virology
+28 Xenobiology
+29 Law Office
+30 Detective's Office
+*/
+
+//The whole system for the sorttype var is determined based on the order of this list,
+//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
+
+//If you don't want to fuck up disposals, add to this list, and don't change the order.
+//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
+
+GLOBAL_LIST_INIT(TAGGERLOCATIONS, list(
+	"Disposals",
+	"Cargo Bay",
+	"QM Office",
+	"Engineering",
+	"CE Office",
+	"Atmospherics",
+	"Security",
+	"HoS Office",
+	"Medbay",
+	"CMO Office",
+	"Chemistry",
+	"Research",
+	"RD Office",
+	"Robotics",
+	"HoP Office",
+	"Library",
+	"Chapel",
+	"Theatre",
+	"Bar",
+	"Kitchen",
+	"Hydroponics",
+	"Janitor Closet",
+	"Genetics",
+	"Testing Range",
+	"Toxins",
+	"Dormitories",
+	"Virology",
+	"Xenobiology",
+	"Law Office",
+	"Detective's Office",
+))
+
+#define MAPPING_HELPER_SORT(name, sort_code) /obj/structure/disposalpipe/sorting/mail/destination/##name {\
+	sortType = sort_code;\
+}\
+/obj/structure/disposalpipe/sorting/mail/destination/##name/flip {\
+	flip_type = /obj/structure/disposalpipe/sorting/mail;\
+	icon_state = "pipe-j2s";\
+	initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP;\
+}
+
+MAPPING_HELPER_SORT(disposals, 1)
+MAPPING_HELPER_SORT(cargo_bay, 2)
+MAPPING_HELPER_SORT(qm_office, 3)
+MAPPING_HELPER_SORT(engineering, 4)
+MAPPING_HELPER_SORT(ce_office, 5)
+MAPPING_HELPER_SORT(atmospherics, 6)
+MAPPING_HELPER_SORT(security, 7)
+MAPPING_HELPER_SORT(hos_office, 8)
+MAPPING_HELPER_SORT(medbay, 9)
+MAPPING_HELPER_SORT(cmo_office, 10)
+MAPPING_HELPER_SORT(chemistry, 11)
+MAPPING_HELPER_SORT(research, 12)
+MAPPING_HELPER_SORT(rd_office, 13)
+MAPPING_HELPER_SORT(robotics, 14)
+MAPPING_HELPER_SORT(hop_office, 15)
+MAPPING_HELPER_SORT(library, 16)
+MAPPING_HELPER_SORT(chapel, 17)
+MAPPING_HELPER_SORT(threatre, 18)
+MAPPING_HELPER_SORT(bar, 19)
+MAPPING_HELPER_SORT(kitchen, 20)
+MAPPING_HELPER_SORT(hydroponics, 21)
+MAPPING_HELPER_SORT(janitor_closet, 22)
+MAPPING_HELPER_SORT(genetics, 23)
+MAPPING_HELPER_SORT(testing_range, 24)
+MAPPING_HELPER_SORT(toxins, 25)
+MAPPING_HELPER_SORT(dormitories, 26)
+MAPPING_HELPER_SORT(virology, 27)
+MAPPING_HELPER_SORT(xenobiology, 28)
+MAPPING_HELPER_SORT(law_office, 29)
+MAPPING_HELPER_SORT(detective_office, 30)
+
+#undef MAPPING_HELPER_SORT
+
+#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM)
+
+GLOBAL_LIST_INIT(tagger_destination_areas, list(
+	"Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting),
+	"Cargo Bay"  = list(/area/quartermaster),
+	"QM Office" = list(/area/quartermaster/qm, /area/quartermaster/qm_bedroom),
+	"Engineering" = list(/area/engine, /area/engineering),
+	"CE Office" = list(/area/crew_quarters/heads/chief),
+	"Atmospherics" = list(/area/engine/atmos, /area/engine/atmospherics_engine),
+	"Security" = list(/area/security),
+	"HoS Office" = list(/area/crew_quarters/heads/hos),
+	"Medbay" = list(/area/medical),
+	"CMO Office" = list(/area/crew_quarters/heads/cmo),
+	"Chemistry" = list(/area/medical/chemistry, /area/medical/apothecary),
+	"Research" = list(/area/science),
+	"RD Office" = list(/area/crew_quarters/heads/hor),
+	"Robotics" = list(/area/science/robotics),
+	"HoP Office" = list(/area/crew_quarters/heads/hop),
+	"Library" = list(/area/library),
+	"Chapel" = list(/area/chapel),
+	"Theatre" = list(/area/crew_quarters/theatre),
+	"Bar" = list(/area/crew_quarters/bar),
+	"Kitchen" = list(/area/crew_quarters/kitchen),
+	"Hydroponics" = list(/area/hydroponics),
+	"Janitor Closet" = list(/area/janitor),
+	"Genetics" = list(/area/medical/genetics),
+	"Testing Range" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing),
+	"Toxins" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing),
+	"Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms),
+	"Virology" = list(/area/medical/virology),
+	"Xenobiology" = list(/area/science/xenobiology),
+	"Law Office" = list(/area/lawoffice),
+	"Detective's Office" = list(/area/security/detectives_office),
+))
+
+#endif
+

code/_globalvars/lists/flavor_misc.dm

@@ -234,84 +234,6 @@ GLOBAL_LIST_INIT(scarySounds, list(
 	'sound/weapons/thudswoosh.ogg',
 ))
 
-
-// Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to
-// the index of the sort department that you want. For example, sortType set to 2 will reroute all packages
-// tagged for the Cargo Bay.
-
-/* List of sortType codes for mapping reference
-0 Waste
-1 Disposals - All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler.
-2 Cargo Bay
-3 QM Office
-4 Engineering
-5 CE Office
-6 Atmospherics
-7 Security
-8 HoS Office
-9 Medbay
-10 CMO Office
-11 Chemistry
-12 Research
-13 RD Office
-14 Robotics
-15 HoP Office
-16 Library
-17 Chapel
-18 Theatre
-19 Bar
-20 Kitchen
-21 Hydroponics
-22 Janitor
-23 Genetics
-24 Testing Range
-25 Toxins
-26 Dormitories
-27 Virology
-28 Xenobiology
-29 Law Office
-30 Detective's Office
-*/
-
-//The whole system for the sorttype var is determined based on the order of this list,
-//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
-
-//If you don't want to fuck up disposals, add to this list, and don't change the order.
-//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
-
-GLOBAL_LIST_INIT(TAGGERLOCATIONS, list(
-	"Disposals",
-	"Cargo Bay",
-	"QM Office",
-	"Engineering",
-	"CE Office",
-	"Atmospherics",
-	"Security",
-	"HoS Office",
-	"Medbay",
-	"CMO Office",
-	"Chemistry",
-	"Research",
-	"RD Office",
-	"Robotics",
-	"HoP Office",
-	"Library",
-	"Chapel",
-	"Theatre",
-	"Bar",
-	"Kitchen",
-	"Hydroponics",
-	"Janitor Closet",
-	"Genetics",
-	"Testing Range",
-	"Toxins",
-	"Dormitories",
-	"Virology",
-	"Xenobiology",
-	"Law Office",
-	"Detective's Office",
-))
-
 GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "")
 
 GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt") + "")

code/controllers/subsystem/job.dm

@@ -35,6 +35,7 @@ SUBSYSTEM_DEF(job)
 		JOB_NAME_AI,
 		JOB_NAME_ASSISTANT,
 		JOB_NAME_CYBORG,
+		JOB_NAME_POSIBRAIN,
 		JOB_NAME_CAPTAIN,
 		JOB_NAME_HEADOFPERSONNEL,
 		JOB_NAME_HEADOFSECURITY,
@@ -553,7 +554,14 @@ SUBSYSTEM_DEF(job)
 				newplayer.new_character = living_mob
 			else
 				M = living_mob
-
+		else
+			if(!isnull(new_mob)) //Detect fail condition on equip
+			//if equip() is somehow able to fail, send them back to lobby
+				var/mob/dead/new_player/NP = new()
+				NP.ckey = M.client.ckey
+				qdel(M)
+				to_chat(M, "Error equipping [rank]. Returning to lobby.</b>")
+				return null
 		SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()
 
 		if(M.client.holder)

code/controllers/subsystem/traumas.dm

@@ -148,7 +148,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
 			/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
 			/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
-			/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/bio_hood/plague, /obj/item/clothing/mask/gas/plaguedoctor)),
+			/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/costume/plague, /obj/item/clothing/mask/gas/plaguedoctor)),
 
 		"authority"   = typecacheof(list(
 			/obj/item/clothing/under/rank/captain,  /obj/item/clothing/under/rank/civilian/head_of_personnel,

code/datums/traits/negative_quirk.dm

@@ -192,11 +192,11 @@
 				heirloom_type = pick(subtypesof(/obj/item/toy/mecha)) //look at this nerd
 			//Medical
 			if(JOB_NAME_CHIEFMEDICALOFFICER)
-				heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag)
+				heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/flashlight/pen)
 			if(JOB_NAME_MEDICALDOCTOR)
-				heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag)
+				heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/flashlight/pen, /obj/item/scalpel)
 			if(JOB_NAME_PARAMEDIC)
-				heirloom_type = pick(/obj/item/bodybag)
+				heirloom_type = pick(/obj/item/flashlight/pen, /obj/item/sensor_device)
 			if(JOB_NAME_CHEMIST)
 				heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom
 			if(JOB_NAME_VIROLOGIST)

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

@@ -84,7 +84,7 @@
 	name = "plague doctor costume spawner"
 	items = list(
 		/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
-		/obj/item/clothing/head/bio_hood/plague,
+		/obj/item/clothing/head/costume/plague,
 		/obj/item/clothing/mask/gas/plaguedoctor)
 
 /obj/effect/spawner/bundle/costume/nightowl

code/game/objects/items/storage/belt.dm

@@ -385,14 +385,16 @@
 		/obj/item/resonator,
 		/obj/item/mining_scanner,
 		/obj/item/pickaxe,
+		/obj/item/shovel,
 		/obj/item/stack/sheet/animalhide,
 		/obj/item/stack/sheet/sinew,
 		/obj/item/stack/sheet/bone,
 		/obj/item/lighter,
 		/obj/item/storage/fancy/cigarettes,
 		/obj/item/reagent_containers/food/drinks/bottle,
 		/obj/item/stack/medical,
-		/obj/item/knife/kitchen,
+		/obj/item/knife/combat/survival,
+		/obj/item/tank/internals/emergency_oxygen,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/gps,
 		/obj/item/storage/bag/ore,
@@ -411,6 +413,8 @@
 		/obj/item/skeleton_key,
 		/obj/item/discovery_scanner,
 		/obj/item/gun/energy/e_gun/mini/exploration,
+		/obj/item/gun/energy/kinetic_accelerator,
+		/obj/item/gun/energy/plasmacutter,
 		/obj/item/grenade/exploration,
 		/obj/item/exploration_detonator,
 		/obj/item/research_disk_pinpointer