cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes skrell helmet refitting, modkit text

Browse Source
This commit is contained in:
mwerezak
2014-07-20 11:24:22 -04:00
parent 3d9f1754cd
commit e9772faabc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/objects/items/devices/modkit.dm
View File

@@ -7,7 +7,7 @@
desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user." desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user."
icon_state = "modkit" icon_state = "modkit"
var/parts = MODKIT_FULL var/parts = MODKIT_FULL
var/target_species = null var/target_species = "Human"
var/list/permitted_types = list( var/list/permitted_types = list(
/obj/item/clothing/head/helmet/space/rig, /obj/item/clothing/head/helmet/space/rig,
@@ -15,6 +15,8 @@
) )
/obj/item/device/modkit/afterattack(obj/O, mob/user as mob) /obj/item/device/modkit/afterattack(obj/O, mob/user as mob)
if (!target_species)
return //it shouldn't be null, okay?
if(!parts) if(!parts)
user << "<span class='warning'>This kit has no parts for this modification left.</span>" user << "<span class='warning'>This kit has no parts for this modification left.</span>"
@@ -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].") 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)
I.refit_for_species(target_species)
else
I.refit_for_species("Human")
if (istype(I, /obj/item/clothing/head/helmet)) if (istype(I, /obj/item/clothing/head/helmet))
parts &= ~MODKIT_HELMET parts &= ~MODKIT_HELMET
@@ -62,9 +60,9 @@
/obj/item/device/modkit/examine() /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 /obj/item/device/modkit/tajaran
name = "tajaran hardsuit modification kit" 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" target_species = "Tajaran"

4
code/modules/clothing/clothing.dm
View File

@@ -44,8 +44,10 @@
/obj/item/clothing/head/helmet/refit_for_species(var/target_species) /obj/item/clothing/head/helmet/refit_for_species(var/target_species)
switch(target_species) switch(target_species)
if("Human") if("Skrell")
species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox") species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox")
if("Human")
species_restricted = list("exclude","Skrell","Unathi","Tajaran","Diona","Vox")
else else
species_restricted = list(target_species) species_restricted = list(target_species)