Merge branch 'master' into the-p-o-o-l

2020-01-13 16:38:53 -06:00
parent 0d164969eb be7fef7048
commit fce73c84c7
110 changed files with 3440 additions and 3268 deletions
@@ -244,6 +244,10 @@
 	name = "Shark"
 	icon_state = "shark"

+/datum/sprite_accessory/mam_snouts/hshark
+	name = "hShark"
+	icon_state = "hshark"
+
 /datum/sprite_accessory/mam_snouts/toucan
 	name = "Toucan"
 	icon_state = "toucan"