Merge remote-tracking branch 'upstream/master'

2020-08-20 05:21:15 +02:00
parent 8eedd7174c 23648a0c44
commit 0acbb0fc6b
3 changed files with 9 additions and 2 deletions
@@ -192,13 +192,13 @@
 	extra = TRUE
 	extra_color_src = MUTCOLORS3

-/datum/sprite_accessory/mam_snouts/skulldog
+/datum/sprite_accessory/snouts/mam_snouts/skulldog
 	name = "Skulldog"
 	icon_state = "skulldog"
 	extra = TRUE
 	extra_color_src = MATRIXED

-/datum/sprite_accessory/mam_snouts/lcanid
+/datum/sprite_accessory/snouts/mam_snouts/lcanid
 	name = "Mammal, Long"
 	icon_state = "lcanid"

@@ -10,6 +10,9 @@
 /datum/nanite_extra_setting/text/get_copy()
 	return new /datum/nanite_extra_setting/text(value)

+/datum/nanite_extra_setting/text/get_value()
+	return html_encode(value)
+
 /datum/nanite_extra_setting/text/get_frontend_list(name)
 	return list(list(
 		"name" = name,
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - bugfix: "two snouts can once again be chosen in customization"