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

Update rig_pieces_vr.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-30 01:09:21 -04:00
committed by GitHub
parent b560f4a5c0
commit c1bd08a584
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+1 -7
View File
@@ -12,14 +12,8 @@
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
<<<<<<< HEAD
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
SPECIES_GREY_YW = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi'
=======
SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi'
>>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
)