Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

2020-01-14 23:42:37 +08:00
parent 16b5c83a3a 69d986df8a
commit cb3a4caa63
126 changed files with 284 additions and 73 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"