From 9e20ead03a56a2c5c415ff1f767bfac67324e859 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 23 Feb 2018 11:51:11 -0500 Subject: [PATCH] Small tweak to survival boxes Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those). --- .../objects/items/weapons/storage/boxes.dm | 5 +++ .../living/carbon/human/species/species.dm | 34 +++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 5f3bbcc0c3c..09e1c9b139d 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -59,6 +59,11 @@ /obj/item/clothing/mask/breath ) +/obj/item/weapon/storage/box/survival/synth + name = "synthetic supply box" + desc = "A survival box issued to synthetic crew members for use in emergency situations." + starts_with = list() + /obj/item/weapon/storage/box/survival/comp name = "emergency supply box" desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies." diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 66b3fd492b7..503272c9300 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -236,29 +236,33 @@ /datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0) var/boxtype = /obj/item/weapon/storage/box/survival //Default survival box - if(H.isSynthetic()) - boxtype = /obj/item/weapon/storage/box //Empty box for synths + var/synth = H.isSynthetic() - //Special box for engineers - if(comprehensive) + //Empty box for synths + if(synth) + boxtype = /obj/item/weapon/storage/box/survival/synth + + //Special box with extra equipment + else if(comprehensive) boxtype = /obj/item/weapon/storage/box/survival/comp //Create the box var/obj/item/weapon/storage/box/box = new boxtype(H) - //Create a tank (if such a thing exists for this species) - var/tanktext = "/obj/item/weapon/tank/emergency/" + "[breath_type]" - var/obj/item/weapon/tank/emergency/tankpath //Will force someone to come look here if they ever alter this path. - if(extendedtank) - tankpath = text2path(tanktext + "/engi") - if(!tankpath) //Is it just that there's no /engi? - tankpath = text2path(tanktext + "/double") + if(!synth) + //Create a tank (if such a thing exists for this species) + var/tanktext = "/obj/item/weapon/tank/emergency/" + "[breath_type]" + var/obj/item/weapon/tank/emergency/tankpath //Will force someone to come look here if they ever alter this path. + if(extendedtank) + tankpath = text2path(tanktext + "/engi") + if(!tankpath) //Is it just that there's no /engi? + tankpath = text2path(tanktext + "/double") - if(!tankpath) - tankpath = text2path(tanktext) + if(!tankpath) + tankpath = text2path(tanktext) - if(tankpath) - new tankpath(box) + if(tankpath) + new tankpath(box) box.calibrate_size()