mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
A "postal workers strike" negative station trait. (can be positive) (#80213)
## About The Pull Request Added a negative station trait, which blocks the mail like it's sunday or a official holiday. However! If it's actually sunday or a official holiday, when the mail would be normally blocked already, instead it'll unblock it. It was done this way because it's easier (station traits are loaded before the events and economy subsystems are initialized) and cooler. ## Why It's Good For The Game Granted there are quite a few station traits around cargo already, features interacting with other features is honestly a good thing. ## Changelog 🆑 add: Added a "postal workers strike" negative station trait. In the case of holidays and sunday though, it'll be a "postal system overtime" instead. /🆑 --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
@@ -141,3 +141,59 @@
|
||||
/obj/item/restraints/legcuffs/beartrap/prearmed = 5, //not really a landmine, but still a good threat
|
||||
/obj/effect/mine/shrapnel = 5,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/contraband/grenades
|
||||
name = "grenades spawner"
|
||||
loot = list(
|
||||
/obj/item/grenade/chem_grenade/metalfoam,
|
||||
/obj/item/grenade/chem_grenade/cleaner,
|
||||
/obj/effect/spawner/random/entertainment/colorful_grenades,
|
||||
/obj/item/grenade/smokebomb,
|
||||
/obj/item/grenade/chem_grenade/antiweed,
|
||||
/obj/item/grenade/spawnergrenade/syndiesoap,
|
||||
/obj/effect/spawner/random/contraband/grenades/dangerous,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/contraband/grenades/dangerous
|
||||
name = "dangerous grenades spawner"
|
||||
loot = list(
|
||||
/obj/item/grenade/flashbang = 3,
|
||||
/obj/item/grenade/chem_grenade/teargas = 2,
|
||||
/obj/item/grenade/iedcasing/spawned = 2,
|
||||
/obj/item/grenade/empgrenade = 2,
|
||||
/obj/item/grenade/antigravity = 2,
|
||||
/obj/effect/spawner/random/contraband/grenades/cluster = 1,
|
||||
/obj/effect/spawner/random/contraband/grenades/lethal = 1,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/contraband/grenades/cluster
|
||||
name = "clusterbusters spawner"
|
||||
loot = list(
|
||||
/obj/item/grenade/clusterbuster/smoke = 4,
|
||||
/obj/item/grenade/clusterbuster/metalfoam = 4,
|
||||
/obj/item/grenade/clusterbuster/cleaner = 4,
|
||||
/obj/item/grenade/clusterbuster = 3,
|
||||
/obj/item/grenade/clusterbuster/teargas = 3,
|
||||
/obj/item/grenade/clusterbuster/antiweed = 3,
|
||||
/obj/item/grenade/clusterbuster/soap = 2,
|
||||
/obj/item/grenade/clusterbuster/emp = 1,
|
||||
/obj/item/grenade/clusterbuster/spawner_spesscarp = 1,
|
||||
/obj/item/grenade/clusterbuster/facid = 1,
|
||||
/obj/item/grenade/clusterbuster/inferno = 1,
|
||||
/obj/item/grenade/clusterbuster/clf3 = 1,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/contraband/grenades/lethal
|
||||
name = "lethal grenades spawner"
|
||||
loot = list(
|
||||
/obj/item/grenade/chem_grenade/incendiary = 3,
|
||||
/obj/item/grenade/chem_grenade/facid = 3,
|
||||
/obj/item/grenade/chem_grenade/ez_clean = 3,
|
||||
/obj/item/grenade/chem_grenade/clf3 = 2,
|
||||
/obj/item/grenade/gluon = 2,
|
||||
/obj/item/grenade/chem_grenade/holy = 2,
|
||||
/obj/item/grenade/spawnergrenade/spesscarp = 1,
|
||||
/obj/item/grenade/spawnergrenade/cat = 1,
|
||||
/obj/item/grenade/frag = 1,
|
||||
/obj/item/grenade/chem_grenade/bioterrorfoam = 1,
|
||||
)
|
||||
|
||||
@@ -281,3 +281,12 @@
|
||||
/obj/item/toy/plush/ratplush = 2,
|
||||
/obj/item/toy/plush/narplush = 2,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/entertainment/colorful_grenades
|
||||
name = "colorful/glitter grenades spawner"
|
||||
loot = list(
|
||||
/obj/item/grenade/chem_grenade/glitter/pink,
|
||||
/obj/item/grenade/chem_grenade/glitter/blue,
|
||||
/obj/item/grenade/chem_grenade/glitter/white,
|
||||
/obj/item/grenade/chem_grenade/colorful
|
||||
)
|
||||
|
||||
@@ -323,3 +323,17 @@
|
||||
/obj/item/food/donut/jelly/slimejelly/matcha = 2,
|
||||
/obj/item/food/donut/jelly/slimejelly/trumpet = 2,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/food_or_drink/any_snack_or_beverage
|
||||
name = "any snack or beverage spawner"
|
||||
icon_state = "slime_jelly_donut"
|
||||
loot = list(
|
||||
/obj/effect/spawner/random/food_or_drink/snack = 6,
|
||||
/obj/effect/spawner/random/food_or_drink/refreshing_beverage = 6,
|
||||
/obj/effect/spawner/random/food_or_drink/donuts = 5,
|
||||
/obj/effect/spawner/random/food_or_drink/donkpockets_single = 5,
|
||||
/obj/effect/spawner/random/food_or_drink/booze = 4,
|
||||
/obj/effect/spawner/random/food_or_drink/snack/lizard = 4,
|
||||
/obj/effect/spawner/random/food_or_drink/jelly_donuts = 3,
|
||||
/obj/effect/spawner/random/food_or_drink/slime_jelly_donuts = 1,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user