From b5e506d40cfc00b6aa4223ec88a5172c75dac4c6 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Tue, 27 Nov 2018 12:42:43 +0000
Subject: [PATCH 1/2] adds species starting boxes

---
 code/game/jobs/job/job.dm                     |  7 +++++--
 .../objects/items/weapons/storage/boxes.dm    | 20 +++++++++++++++++++
 .../mob/living/carbon/human/species/human.dm  |  4 +++-
 .../living/carbon/human/species/plasmaman.dm  |  2 ++
 .../mob/living/carbon/human/species/vox.dm    |  2 ++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 92424dd2bcb..a6b05707fd4 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -168,8 +168,11 @@
 				back = backpack //Department backpack
 
 	if(box)
-		backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
-		backpack_contents[box] = 1
+		var/spawnbox = box
+		if(H.dna.species.speciesbox)
+			spawnbox = H.dna.species.speciesbox
+		backpack_contents.Insert(1, spawnbox) // Box always takes a first slot in backpack
+		backpack_contents[spawnbox] = 1
 
 	if(allow_loadout && H.client && (H.client.prefs.gear && H.client.prefs.gear.len))
 		for(var/gear in H.client.prefs.gear)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 1d23049064f..307443eae57 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -74,6 +74,26 @@
 		new /obj/item/reagent_containers/hypospray/autoinjector( src )
 		return
 
+/obj/item/storage/box/survival_vox
+	icon_state = "box_civ"
+
+/obj/item/storage/box/survival_vox/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/breath/vox(src)
+	new /obj/item/tank/emergency_oxygen/nitrogen(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+
+/obj/item/storage/box/survival_plasmaman
+	icon_state = "box_civ"
+
+/obj/item/storage/box/survival_plasmaman/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/tank/emergency_oxygen/plasma(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+
 /obj/item/storage/box/engineer
 	icon_state = "box_eng"
 	New()
diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm
index 2a161ab9318..cce24189bcd 100644
--- a/code/modules/mob/living/carbon/human/species/human.dm
+++ b/code/modules/mob/living/carbon/human/species/human.dm
@@ -17,4 +17,6 @@
 	worlds tumultous at best."
 
 	reagent_tag = PROCESS_ORG
-	//Has standard darksight of 2.
\ No newline at end of file
+	//Has standard darksight of 2.
+
+	var/speciesbox // Specific species starting boxes
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 82c875444d2..3ac2eca49a3 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -39,6 +39,8 @@
 		"eyes" =     /obj/item/organ/internal/eyes
 		)
 
+	speciesbox = /obj/item/storage/box/survival_plasmaman
+
 /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
 	if(copytext(message, 1, 2) != "*")
 		message = replacetext(message, "s", stutter("ss"))
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index d01f1ccf6fe..5b498e700f9 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -78,6 +78,8 @@
 		"is holding their breath!",
 		"is deeply inhaling oxygen!")
 
+	speciesbox = /obj/item/storage/box/survival_vox
+
 /datum/species/vox/handle_death(mob/living/carbon/human/H)
 	H.stop_tail_wagging(1)
 

From 8f2677115cb6144af111f39779fed87428462971 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Fri, 30 Nov 2018 14:43:54 +0000
Subject: [PATCH 2/2] fixes invalid variable

---
 code/modules/mob/living/carbon/human/species/_species.dm | 3 +++
 code/modules/mob/living/carbon/human/species/human.dm    | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index a728c2bbfd8..f9460bea3e1 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -156,6 +156,9 @@
 	// Mutant pieces
 	var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears
 
+	// Species specific boxes
+	var/speciesbox
+
 /datum/species/New()
 	//If the species has eyes, they are the default vision organ
 	if(!vision_organ && has_organ["eyes"])
diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm
index cce24189bcd..2570fb060e7 100644
--- a/code/modules/mob/living/carbon/human/species/human.dm
+++ b/code/modules/mob/living/carbon/human/species/human.dm
@@ -18,5 +18,4 @@
 
 	reagent_tag = PROCESS_ORG
 	//Has standard darksight of 2.
-
-	var/speciesbox // Specific species starting boxes
\ No newline at end of file
+	
\ No newline at end of file