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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-12 22:31:56 -04:00
committed by GitHub
parent 4b060b0878
commit 35c6b2beb9
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
View File

@@ -1,35 +1,5 @@
/obj/item/clothing/head/helmet/space/rig
sprite_sheets = list(
<<<<<<< HEAD
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_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_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
SPECIES_GREY_YW = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
||||||| parent of edc62e88fa... Merge pull request #11002 from VOREStation/Arokha/rearrange
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_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_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi'
=======
SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi',
SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi',
SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',
@@ -43,7 +13,6 @@
SPECIES_PROMETHEAN = 'icons/inventory/head/mob_skrell.dmi',
SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi'
>>>>>>> edc62e88fa... Merge pull request #11002 from VOREStation/Arokha/rearrange
)
/obj/item/clothing/suit/space/rig