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

This commit is contained in:
Dahlular
2022-04-02 18:43:01 -06:00
910 changed files with 114448 additions and 126508 deletions
@@ -68,6 +68,20 @@
/obj/item/toy/cards/deck/syndicate = 2
)
/obj/effect/spawner/lootdrop/trash
name = "maint trash spawner"
loot = list(/obj/item/cigbutt = 1,
/obj/item/trash/cheesie = 1,
/obj/item/trash/candy = 1,
/obj/item/trash/chips = 1,
/obj/item/reagent_containers/food/snacks/deadmouse = 1,
/obj/item/trash/pistachios = 1,
/obj/item/trash/plate = 1,
/obj/item/trash/popcorn = 1,
/obj/item/trash/raisins = 1,
/obj/item/trash/sosjerky = 1,
/obj/item/trash/syndi_cakes = 1)
/obj/effect/spawner/lootdrop/grille_or_trash
name = "maint grille or trash spawner"
loot = list(/obj/structure/grille = 5,