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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-19 21:02:09 -04:00
committed by GitHub
parent b3ccdb22a9
commit aacd8746ba
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,11 +93,6 @@
desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice."
icon_state = "pizzadelivery"
icon = 'icons/obj/clothing/hats_vr.dmi'
<<<<<<< HEAD
icon_override = 'icons/mob/head_vr.dmi'
||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
icon_override = 'icons/mob/head_vr.dmi'
=======
icon_override = 'icons/mob/head_vr.dmi'
//////////TALON HATS//////////
@@ -134,4 +129,3 @@ obj/item/clothing/head/beret/talon/command
icon_override = 'icons/mob/head_vr.dmi'
icon_state = "beret_talon_officer"
item_state = "baret_talon_command"
>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch