cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-04-30 22:18:29 -04:00
committed by GitHub
parent d1460c5713
commit 53575d02f9
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/clothing/head/misc_vr.dm
View File

@@ -163,8 +163,6 @@
sprite_sheets = list( sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
) )
<<<<<<< HEAD
=======
// tiny tophat // tiny tophat
@@ -174,4 +172,3 @@
icon = 'icons/inventory/head/item_vr.dmi' icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "tiny_tophat" icon_state = "tiny_tophat"
>>>>>>> 47d0f998d9... Merge pull request #14823 from SatinIsle/Striped-Clown-Uniform-Set