Merge remote-tracking branch 'upstream/master' into floorcluwneport

2021-05-31 22:21:34 -04:00
parent e0a1e50927 cb52be5dd9
commit 70926f5daf
68 changed files with 576 additions and 301 deletions
@@ -355,3 +355,10 @@
 	name = "Sakura Kimono'"
 	icon_state = "sakura_kimono"
 	item_state = "sakura_kimono"
+
+/obj/item/clothing/under/costume/swagoutfit
+	name = "Swag outfit"
+	desc = "Why don't you go secure some bitches?"
+	icon_state = "SwagOutfit"
+	item_state = "SwagOutfit"
+	can_adjust = FALSE