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

Update glasses.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-30 01:07:24 -04:00
committed by GitHub
parent f2385f3e9a
commit b560f4a5c0
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/glasses.dm
+3 -11
View File
@@ -31,18 +31,10 @@ BLIND // can't see anything
pickup_sound = 'sound/items/pickup/accessory.ogg'
sprite_sheets = list(
<<<<<<< HEAD
"Teshari" = 'icons/mob/species/seromi/eyes.dmi',
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Sergal" = 'icons/mob/species/sergal/eyes_yw.dmi',
SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/
||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
"Teshari" = 'icons/mob/species/seromi/eyes.dmi',
"Vox" = 'icons/mob/species/vox/eyes.dmi'
=======
SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi',
SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi'
>>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi',
"Sergal" = 'icons/mob/species/sergal/eyes_yw.dmi', //YWedit
SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/
)
/obj/item/clothing/glasses/update_clothing_icon()