From e9772faabcff4eac867226084d884a777aa3b51d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 20 Jul 2014 11:24:22 -0400 Subject: [PATCH] Fixes skrell helmet refitting, modkit text --- code/game/objects/items/devices/modkit.dm | 14 ++++++-------- code/modules/clothing/clothing.dm | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 2921559a63..a1de93987f 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -7,7 +7,7 @@ desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user." icon_state = "modkit" var/parts = MODKIT_FULL - var/target_species = null + var/target_species = "Human" var/list/permitted_types = list( /obj/item/clothing/head/helmet/space/rig, @@ -15,6 +15,8 @@ ) /obj/item/device/modkit/afterattack(obj/O, mob/user as mob) + if (!target_species) + return //it shouldn't be null, okay? if(!parts) user << "This kit has no parts for this modification left." @@ -45,11 +47,7 @@ user.visible_message("\red [user] opens \the [src] and modifies \the [O].","\red You open \the [src] and modify \the [O].") - if (target_species) - I.refit_for_species(target_species) - else - I.refit_for_species("Human") - + I.refit_for_species(target_species) if (istype(I, /obj/item/clothing/head/helmet)) parts &= ~MODKIT_HELMET @@ -62,9 +60,9 @@ /obj/item/device/modkit/examine() ..() - usr << "It looks as though it modifies hardsuits to fit the following [target_species? target_species : "Human"] users." + usr << "It looks as though it modifies hardsuits to fit [target_species] users." /obj/item/device/modkit/tajaran name = "tajaran hardsuit modification kit" - desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajara." + desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran." target_species = "Tajaran" \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 5ad55ff557..f6681f9d22 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -44,8 +44,10 @@ /obj/item/clothing/head/helmet/refit_for_species(var/target_species) switch(target_species) - if("Human") + if("Skrell") species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox") + if("Human") + species_restricted = list("exclude","Skrell","Unathi","Tajaran","Diona","Vox") else species_restricted = list(target_species)