Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.

This commit is contained in:
Zuhayr
2014-05-15 14:46:27 +09:30
parent 429684d5ac
commit a528a4db1f
20 changed files with 44 additions and 43 deletions
-1
View File
@@ -1012,7 +1012,6 @@
#include "code\modules\mob\living\simple_animal\parrot.dm"
#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\vox.dm"
#include "code\modules\mob\living\simple_animal\worm.dm"
#include "code\modules\mob\living\simple_animal\friendly\cat.dm"
#include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
+4 -31
View File
@@ -130,12 +130,14 @@
icon_state = "vox-carapace"
item_state = "vox-carapace"
desc = "A glowing visor, perhaps stolen from a depressed Cylon."
species_restricted = list("Vox","Vox Armalis")
/obj/item/clothing/suit/space/vox/carapace
name = "alien carapace armour"
icon_state = "vox-carapace"
item_state = "vox-carapace"
desc = "An armoured, segmented carapace with glowing purple lights. It looks pretty run-down."
species_restricted = list("Vox","Vox Armalis")
/obj/item/clothing/head/helmet/space/vox/stealth
name = "alien stealth helmet"
@@ -187,7 +189,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
item_color="gloves-vox"
species_restricted = list("Vox")
species_restricted = list("Vox","Vox Armalis")
/obj/item/clothing/shoes/magboots/vox
@@ -195,7 +197,7 @@
name = "vox magclaws"
item_state = "boots-vox"
icon_state = "boots-vox"
species_restricted = list("Vox")
species_restricted = list("Vox","Vox Armalis")
action_button_name = "Toggle the magclaws"
/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user)
@@ -235,35 +237,6 @@
if (magpulse)
usr << "It would be hard to take these off without relaxing your grip first." //theoretically this message should only be seen by the wearer when the claws are equipped.
//Vox Armalis gear.
/obj/item/clothing/shoes/magboots/vox/armalis
name = "large vox magclaws"
item_state = "boots-armalis"
icon_state = "boots-armalis"
icon_override = 'icons/mob/vox.dmi'
species_restricted = list("Vox Armalis")
/obj/item/clothing/gloves/yellow/vox/armalis
name = "large insulated gauntlets"
item_state = "gloves-armalis"
icon_state = "gloves-armalis"
icon_override = 'icons/mob/vox.dmi'
species_restricted = list("Vox Armalis")
/obj/item/clothing/mask/breath/vox/armalis
name = "large vox mask"
item_state = "mask-armalis"
icon_state = "mask-armalis"
icon_override = 'icons/mob/vox.dmi'
species_restricted = list("Vox Armalis")
/obj/item/clothing/suit/space/vox/carapace/armalis
name = "large alien carapace armour"
item_state = "armour-armalis"
icon_state = "armour-armalis"
icon_override = 'icons/mob/vox.dmi'
species_restricted = list("Vox Armalis")
//Species-specific Syndicate rigs.
/obj/item/clothing/head/helmet/space/rig/syndi/tajara
+40 -10
View File
@@ -42,6 +42,26 @@
var/blood_color = "#A10808" //Red.
var/flesh_color = "#FFC896" //Pink.
/* Species-specific sprites, concept stolen from Paradise//vg/.
ex:
sprite_sheets = list(
"held" = 'icons/mob/path',
"uniform" = 'icons/mob/path',
"suit" = 'icons/mob/path',
"belt" = 'icons/mob/path'
"head" = 'icons/mob/path',
"back" = 'icons/mob/path',
"mask" = 'icons/mob/path',
"ears" = 'icons/mob/path',
"eyes" = 'icons/mob/path',
"feet" = 'icons/mob/path',
"gloves" = 'icons/mob/path'
)
If index term exists and icon_override is not set, this sprite sheet will be used.
*/
var/list/sprite_sheets = list()
/datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
//This is a basic humanoid limb setup.
H.organs = list()
@@ -78,14 +98,12 @@
for(var/datum/organ/internal/I in H.internal_organs)
I.mechanize()
return
/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
return
/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
if(flags & IS_SYNTHETIC)
//H.make_jittery(200) //S-s-s-s-sytem f-f-ai-i-i-i-i-lure-ure-ure-ure
//H.make_jittery(200) //S-s-s-s-sytem f-f-ai-i-i-i-i-lure-ure-ure-ure
H.h_style = ""
spawn(100)
//H.is_jittery = 0
@@ -182,11 +200,20 @@
blood_color = "#2299FC"
flesh_color = "#808D11"
sprite_sheets = list(
"suit" = 'icons/mob/species/vox/suit.dmi',
"head" = 'icons/mob/species/vox/head.dmi',
"mask" = 'icons/mob/species/vox/mask.dmi',
"feet" = 'icons/mob/species/vox/feet.dmi',
"gloves" = 'icons/mob/species/vox/gloves.dmi'
)
/datum/species/vox/armalis
name = "Vox Armalis"
icobase = 'icons/mob/human_races/r_armalis.dmi'
deform = 'icons/mob/human_races/r_armalis.dmi'
language = "Vox-pidgin"
attack_verb = "slash"
warning_low_pressure = 50
hazard_low_pressure = 0
@@ -212,14 +239,19 @@
tail = "armalis_tail"
/datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
H.verbs += /mob/living/carbon/human/proc/gut
..()
sprite_sheets = list(
"suit" = 'icons/mob/species/armalis/suit.dmi',
"gloves" = 'icons/mob/species/armalis/gloves.dmi',
"feet" = 'icons/mob/species/armalis/feet.dmi',
"head" = 'icons/mob/species/armalis/head.dmi',
"held" = 'icons/mob/species/armalis/held.dmi'
)
/datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
/datum/species/vox/create_organs(var/mob/living/carbon/human/H)
H.verbs += /mob/living/carbon/human/proc/leap
..() //create organs first.
//Now apply cortical stack.
var/datum/organ/external/affected = H.get_organ("head")
//To avoid duplicates.
@@ -238,8 +270,6 @@
M.cortical_stacks += I
M.raiders[H.mind] = I
return ..()
/datum/species/diona
name = "Diona"
icobase = 'icons/mob/human_races/r_diona.dmi'
-1
View File
@@ -120,7 +120,6 @@
desc = "It's some kind of enormous alien weapon, as long as a man is tall."
icon = 'icons/obj/gun.dmi' //Actual on-sprite is handled by icon_override.
icon_override = 'icons/mob/vox.dmi'
icon_state = "noisecannon"
item_state = "noisecannon"
recoil = 1
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 235 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB