Resolve polaris merge conflicts

This commit is contained in:
Eearslya
2016-08-06 21:39:24 -07:00
parent 85c3e22873
commit 42618dcef1
3 changed files with 5 additions and 9 deletions
@@ -12,6 +12,7 @@
var/r_tail = 30 // Tail/Taur color
var/g_tail = 30 // Tail/Taur color
var/b_tail = 30 // Tail/Taur color
var/dress_mob = TRUE
// Definition of the stuff for Ears
/datum/category_item/player_setup_item/vore/ears