Merge branch 'master' into plant-adding

This commit is contained in:
DragonTrance
2021-02-21 12:06:48 -07:00
committed by GitHub
246 changed files with 4270 additions and 3557 deletions
+7
View File
@@ -237,6 +237,7 @@
desc = "Holds a variety of gear for \"alternative\" peacekeeping."
icon_state = "slutbelt"
item_state = "slut"
price = 5
obj/item/storage/belt/slut/ComponentInitialize()
. = ..()
@@ -370,6 +371,12 @@ obj/item/storage/belt/slut/ComponentInitialize()
/obj/item/clothing/mask/luchador
)
/obj/item/storage/belt/cummerbund
name = "cummerbund" //I swear to god if you people aren't mature enough to handle this I'm just gonna call it a sash.
desc = "A pleated sash that pairs well with a suit jacket."
icon_state = "cummerbund"
item_state = "cummerbund"
/obj/item/storage/belt/military
name = "chest rig"
desc = "A set of tactical webbing worn by Syndicate boarding parties."