Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two

This commit is contained in:
timothyteakettle
2021-05-14 01:59:32 +01:00
99 changed files with 4046 additions and 1393 deletions
@@ -67,6 +67,13 @@
matrixed_sections = MATRIX_RED_GREEN
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
/datum/sprite_accessory/ears/bunnyalt
name = "Bunny (Vegas)"
icon_state = "bunnyalt"
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
/datum/sprite_accessory/ears/cat
name = "Cat"
icon_state = "cat"
@@ -258,6 +265,11 @@
icon_state = "bunny"
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/ears/mam_ears/bunnyalt
name = "Bunny (Vegas)"
icon_state = "bunnyalt"
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/ears/mam_ears/cat
name = "Cat"
icon_state = "cat"