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
2022-09-25 17:45:39 -04:00
committed by GitHub
parent 653720b0c6
commit 00addc1b24
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/new_player/sprite_accessories_ear_vr.dm
View File

@@ -860,8 +860,6 @@
extra_overlay = "altevian-inner" extra_overlay = "altevian-inner"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
<<<<<<< HEAD
=======
/datum/sprite_accessory/ears/wilddog /datum/sprite_accessory/ears/wilddog
name = "Wild Dog Ears" name = "Wild Dog Ears"
@@ -871,4 +869,3 @@
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
extra_overlay = "wild_doginner" extra_overlay = "wild_doginner"
>>>>>>> c72edf2a81... Merge pull request #13802 from radiantAurora/radiantAurora-markings