Merge branch 'master' into plant-adding

This commit is contained in:
DragonTrance
2021-02-21 12:06:48 -07:00
committed by GitHub
246 changed files with 4270 additions and 3557 deletions
@@ -876,6 +876,10 @@ datum/sprite_accessory/ears/human/gret
name = "Otie"
icon_state = "otie"
/datum/sprite_accessory/mam_snouts/orca
name = "Orca"
icon_state = "orca"
/datum/sprite_accessory/mam_snouts/pede
name = "Scolipede"
icon_state = "pede"
@@ -984,6 +988,36 @@ datum/sprite_accessory/ears/human/gret
name = "Synthetic Lizard Barless Alt - Snout Tertiary Under"
icon_state = "synthlizbarlessalt_tertunder"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizaxon
color_src = MATRIXED
name = "Synthetic Lizard - AXON"
icon_state = "synthlizaxon"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizaxon_alt
color_src = MATRIXED
name = "Synthetic Lizard - AXON Alt"
icon_state = "synthlizaxon_alt"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizaxon_tert
color_src = MATRIXED
name = "Synthetic Lizard - AXON Tertiary"
icon_state = "synthlizaxon_tert"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizproto1
color_src = MATRIXED
name = "Synthetic Lizard - Prototype Visor 1"
icon_state = "synthlizproto1"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizproto2
color_src = MATRIXED
name = "Synthetic Lizard - Prototype Visor 2"
icon_state = "synthlizproto2"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizspectre
color_src = MATRIXED
name = "Synthetic Lizard - Spectre"
icon_state = "synthlizspectre"
/******************************************
**************** Snouts *******************
*************but higher up*****************/
@@ -1166,7 +1200,6 @@ datum/sprite_accessory/ears/human/gret
icon_state = "gret"
color_src = MUTCOLORS3
/datum/sprite_accessory/mam_ears/elephant
name = "Elephant"
icon_state = "elephant"
@@ -1183,6 +1216,10 @@ datum/sprite_accessory/ears/human/gret
name = "Fox"
icon_state = "fox"
/datum/sprite_accessory/mam_ears/goathorns
name = "Goat Horns"
icon_state = "goathorns"
/datum/sprite_accessory/mam_ears/husky
name = "Husky"
icon_state = "wolf"
@@ -1537,6 +1574,18 @@ datum/sprite_accessory/mam_tails/insect
name = "Redpanda"
icon_state = "redpanda"
/datum/sprite_accessory/mam_body_markings/abs
name = "Abdominals"
icon_state = "abs"
/datum/sprite_accessory/mam_body_markings/abstwo
name = "Abdominals Two-Tones"
icon_state = "absbelly"
/datum/sprite_accessory/mam_body_markings/absthree
name = "Abdominals Three-Tones"
icon_state = "absarms"
/datum/sprite_accessory/mam_body_markings/bee
name = "Bee"
icon_state = "bee"
@@ -2148,6 +2197,21 @@ datum/sprite_accessory/mam_tails/insect
name = "Synthetic Lizard - Antennae Plate"
icon_state = "synth_antennaeover"
/datum/sprite_accessory/antenna/synthliz/synthliz_integrator
color_src = MATRIXED
name = "Synthetic Lizard - Integrator Horns"
icon_state = "synth_integrator"
/datum/sprite_accessory/antenna/synthliz/synthliz_antennaquad
color_src = MATRIXED
name = "Synthetic Lizard - Quad Antennae"
icon_state = "synth_antennaquad"
/datum/sprite_accessory/antenna/synthliz/synthliz_cobrahood
color_src = MATRIXED
name = "Synthetic Lizard - Cobra Hood"
icon_state = "synth_cobrahood"
// *** Snooooow flaaaaake ***
/datum/sprite_accessory/horns/guilmon