Merge pull request #3133 from KasparoVy/Vox-Masks

Vox Mask Additions+Adjustments, Removes Duplicate Human Balaclava
This commit is contained in:
Fox McCloud
2016-01-07 19:53:05 -05:00
6 changed files with 62 additions and 2 deletions
+7 -1
View File
@@ -24,15 +24,21 @@
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = 2
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi'
)
/obj/item/clothing/mask/luchador/tecnicos
name = "Tecnicos Mask"
desc = "Worn by robust fighters who uphold justice and fight honorably."
icon_state = "luchador"
item_state = "luchador"
species_fit = list("Vox")
/obj/item/clothing/mask/luchador/rudos
name = "Rudos Mask"
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"
item_state = "luchar"
species_fit = list("Vox")
+2
View File
@@ -25,6 +25,7 @@
flash_protect = 2
tint = 2
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
species_fit = list("Vox")
origin_tech = "materials=2;engineering=2"
action_button_name = "Toggle Welding Helmet"
@@ -207,6 +208,7 @@
var/safety = 1
ignore_maskadjust = 0
species_fit = list()
species_fit = list("Vox")
action_button_name = "HALT!"
/obj/item/clothing/mask/gas/sechailer/swat
+16 -1
View File
@@ -49,6 +49,10 @@
desc = "moustache is totally real."
icon_state = "fake-moustache"
flags_inv = HIDEFACE
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi'
)
/obj/item/clothing/mask/fakemoustache/verb/pontificate()
set name = "Pontificate Evilly"
@@ -171,6 +175,10 @@
ignore_maskadjust = 0
adjusted_flags = SLOT_HEAD
icon_state = "bandbotany"
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi'
)
action_button_name = "Adjust Bandana"
/obj/item/clothing/mask/bandana/attack_self(var/mob/user)
@@ -179,30 +187,37 @@
obj/item/clothing/mask/bandana/red
name = "red bandana"
icon_state = "bandred"
species_fit = list("Vox")
obj/item/clothing/mask/bandana/blue
name = "blue bandana"
icon_state = "bandblue"
species_fit = list("Vox")
obj/item/clothing/mask/bandana/gold
name = "gold bandana"
icon_state = "bandgold"
species_fit = list("Vox")
obj/item/clothing/mask/bandana/green
name = "green bandana"
icon_state = "bandgreen"
species_fit = list("Vox")
/obj/item/clothing/mask/bandana/botany
name = "botany bandana"
desc = "It's a green bandana with some fine nanotech lining."
icon_state = "bandbotany"
species_fit = list("Vox")
/obj/item/clothing/mask/bandana/skull
name = "skull bandana"
desc = "It's a black bandana with a skull pattern."
icon_state = "bandskull"
species_fit = list("Vox")
/obj/item/clothing/mask/bandana/black
name = "black bandana"
desc = "It's a black bandana."
icon_state = "bandblack"
icon_state = "bandblack"
species_fit = list("Vox")