cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8313 from KasparoVy/look-how-you-murdered-my-birb

Browse Source 
Makes Nevrean use Sergal Void & RIG Suit Sprites
This commit is contained in:
Novacat
2020-06-22 07:55:02 -04:00
committed by GitHub
parent 8140d01085 8832841e3d
commit 73d9e4a248
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+7 -4
View File
@@ -140,11 +140,13 @@
switch(target_species)
//VOREStation Edit Start
if(SPECIES_HUMAN, SPECIES_SKRELL) //humanoid bodytypes
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_UNATHI)
species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID)
if(SPECIES_VULPKANIN)
species_restricted = list(SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC)
if(SPECIES_SERGAL)
species_restricted = list(SPECIES_SERGAL, SPECIES_NEVREAN)
//VOREStation Edit End
else
species_restricted = list(target_species)
@@ -166,15 +168,16 @@
switch(target_species)
//VOREStation Edit Start
if(SPECIES_HUMAN)
species_restricted = list(SPECIES_HUMAN, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
species_restricted = list(SPECIES_HUMAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_SKRELL)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_UNATHI)
species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID)
if(SPECIES_VULPKANIN)
species_restricted = list(SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC)
if(SPECIES_SERGAL)
species_restricted = list(SPECIES_SERGAL, SPECIES_NEVREAN)
//VOREStation Edit End
else
species_restricted = list(target_species)
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+9 -7
View File
@@ -3,15 +3,16 @@
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/helmet_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi'
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi'
)
@@ -21,15 +22,16 @@
SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/suit_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi'
SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi'
)
/obj/item/clothing/head/helmet/space/rig
code/modules/clothing/spacesuits/void/void_vr.dm
+18 -14
View File
@@ -6,17 +6,18 @@
//
/obj/item/clothing/head/helmet/space/void
species_restricted = list(SPECIES_HUMAN, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
species_restricted = list(SPECIES_HUMAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
sprite_sheets = list(
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/helmet_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi'
)
sprite_sheets_obj = list(
@@ -24,26 +25,28 @@
SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm
SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', // Copied from void.dm
SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi', // Copied from void.dm
SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/hats.dmi',
SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/hats.dmi',
SPECIES_AKULA = 'icons/obj/clothing/species/akula/hats.dmi',
SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/hats.dmi',
SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
SPECIES_NEVREAN = 'icons/obj/clothing/species/sergal/hats.dmi',
SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
)
/obj/item/clothing/suit/space/void
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
sprite_sheets = list(
SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi',
SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_NEVREAN = 'icons/mob/species/sergal/suit_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi'
)
sprite_sheets_obj = list(
@@ -51,11 +54,12 @@
SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm
SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', // Copied from void.dm
SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi', // Copied from void.dm
SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/suits.dmi',
SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/suits.dmi',
SPECIES_AKULA = 'icons/obj/clothing/species/akula/suits.dmi',
SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/suits.dmi',
SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
SPECIES_NEVREAN = 'icons/obj/clothing/species/sergal/suits.dmi',
SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
)