Merge pull request #10322 from Birdtalon/speciesboxes

Speciesboxes; species specific starting boxes
This commit is contained in:
variableundefined
2018-12-11 19:57:30 +08:00
committed by GitHub
6 changed files with 34 additions and 3 deletions
+5 -2
View File
@@ -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)
@@ -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()
@@ -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"])
@@ -17,4 +17,5 @@
worlds tumultous at best."
reagent_tag = PROCESS_ORG
//Has standard darksight of 2.
//Has standard darksight of 2.
@@ -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"))
@@ -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)