merge conflict

This commit is contained in:
Dip
2020-10-18 16:54:22 -03:00
32 changed files with 573 additions and 293 deletions
+1 -1
View File
@@ -124,7 +124,7 @@
dog_fashion = null
/obj/item/clothing/head/soft/emt
name = "EMT cap"
name = "paramedic cap"
desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
icon_state = "emtsoft"
item_color = "emt"