mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random. (#27445)
* refactor: Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random. * set script PR number * fix broken updatepaths for three course meal * make filenames unique * goddamnit * redirect incorrect icon states * ugh * fix typepath fixes
This commit is contained in:
warriorstar-orion
committed by
GitHub
GitHub
parent
584e6b26d5
commit
af2a3daf22
@@ -50,130 +50,6 @@
|
||||
/obj/item/stock_parts/capacitor/quadratic = 5,//Probably okay, right?
|
||||
/obj/item/stack/ore/bluespace_crystal = 5)
|
||||
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap
|
||||
name = "bluespace harvester reward spawner"
|
||||
lootcount = 1
|
||||
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap/hat
|
||||
name = "exotic hat"
|
||||
loot = list(
|
||||
/obj/item/clothing/head/collectable/chef, //same weighing on all of them
|
||||
/obj/item/clothing/head/collectable/paper,
|
||||
/obj/item/clothing/head/collectable/tophat,
|
||||
/obj/item/clothing/head/collectable/captain,
|
||||
/obj/item/clothing/head/collectable/beret,
|
||||
/obj/item/clothing/head/collectable/welding,
|
||||
/obj/item/clothing/head/collectable/flatcap,
|
||||
/obj/item/clothing/head/collectable/pirate,
|
||||
/obj/item/clothing/head/collectable/kitty,
|
||||
/obj/item/clothing/head/crown/fancy,
|
||||
/obj/item/clothing/head/collectable/rabbitears,
|
||||
/obj/item/clothing/head/collectable/wizard,
|
||||
/obj/item/clothing/head/collectable/hardhat,
|
||||
/obj/item/clothing/head/collectable/hos,
|
||||
/obj/item/clothing/head/collectable/thunderdome,
|
||||
/obj/item/clothing/head/collectable/swat,
|
||||
/obj/item/clothing/head/collectable/slime,
|
||||
/obj/item/clothing/head/collectable/police,
|
||||
/obj/item/clothing/head/collectable/slime,
|
||||
/obj/item/clothing/head/collectable/xenom,
|
||||
/obj/item/clothing/head/collectable/petehat
|
||||
)
|
||||
|
||||
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap/cultural
|
||||
name = "cultural artifacts"
|
||||
loot = list(
|
||||
/obj/vehicle/space/speedbike/red = 10,
|
||||
/obj/item/grenade/clusterbuster/honk = 10,
|
||||
/obj/item/toy/katana = 10,
|
||||
/obj/item/stack/tile/brass/fifty = 20,
|
||||
/obj/item/stack/sheet/mineral/abductor/fifty = 20,
|
||||
/obj/item/sord = 20,
|
||||
/obj/item/toy/syndicateballoon = 15,
|
||||
/obj/item/lighter/zippo/gonzofist = 5,
|
||||
/obj/item/lighter/zippo/engraved = 5,
|
||||
/obj/item/lighter/zippo/nt_rep = 5,
|
||||
/obj/item/gun/projectile/automatic/c20r/toy = 1,
|
||||
/obj/item/gun/projectile/automatic/l6_saw/toy = 1,
|
||||
/obj/item/gun/projectile/automatic/toy/pistol = 2,
|
||||
/obj/item/gun/projectile/automatic/toy/pistol/enforcer = 1,
|
||||
/obj/item/gun/projectile/shotgun/toy = 1,
|
||||
/obj/item/gun/projectile/shotgun/toy/crossbow = 1,
|
||||
/obj/item/gun/projectile/shotgun/toy/tommygun = 1,
|
||||
/obj/item/gun/projectile/automatic/sniper_rifle/toy = 1,
|
||||
/obj/item/dualsaber/toy = 5,
|
||||
/obj/machinery/snow_machine = 10,
|
||||
/obj/item/clothing/head/kitty = 5,
|
||||
/obj/item/coin/antagtoken = 5,
|
||||
/obj/item/toy/prizeball/figure = 15,
|
||||
/obj/item/toy/prizeball/therapy = 10,
|
||||
/obj/item/bedsheet/patriot = 2,
|
||||
/obj/item/bedsheet/rainbow = 2,
|
||||
/obj/item/bedsheet/captain = 2,
|
||||
/obj/item/bedsheet/centcom = 1, //mythic rare rarity
|
||||
/obj/item/bedsheet/syndie = 2,
|
||||
/obj/item/bedsheet/cult = 2,
|
||||
/obj/item/bedsheet/wiz = 2,
|
||||
/obj/item/stack/sheet/mineral/tranquillite/fifty = 3,
|
||||
/obj/item/clothing/gloves/combat = 5,
|
||||
/obj/item/blank_tarot_card = 5,
|
||||
/obj/item/tarot_card_pack = 5,
|
||||
/obj/item/tarot_card_pack/jumbo = 3,
|
||||
/obj/item/tarot_card_pack/mega = 2
|
||||
)
|
||||
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap/organic
|
||||
name = "organic objects"
|
||||
loot = list(
|
||||
/obj/item/seeds/random/labelled = 50,
|
||||
/obj/item/guardiancreator/biological = 5,
|
||||
/obj/item/organ/internal/vocal_cords/adamantine = 15,
|
||||
/obj/item/storage/pill_bottle/random_meds/labelled = 25,
|
||||
/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 15,
|
||||
/obj/item/dnainjector/telemut = 5,
|
||||
/obj/item/dnainjector/small_size = 5,
|
||||
/obj/item/dnainjector/morph = 5,
|
||||
/obj/item/dnainjector/regenerate = 5,
|
||||
/mob/living/simple_animal/pet/dog/corgi/ = 5,
|
||||
/mob/living/simple_animal/pet/cat = 5,
|
||||
/mob/living/simple_animal/pet/dog/fox/ = 5,
|
||||
/mob/living/simple_animal/pet/penguin/baby = 5,
|
||||
/mob/living/simple_animal/pig = 5,
|
||||
/obj/item/slimepotion/sentience = 5,
|
||||
/obj/item/clothing/mask/cigarette/cigar/havana = 3,
|
||||
/obj/item/stack/sheet/mineral/bananium/fifty = 2, //bananas are organic, clearly.
|
||||
/obj/item/storage/box/monkeycubes = 5,
|
||||
/obj/item/stack/tile/carpet/twenty = 10,
|
||||
/obj/item/stack/tile/carpet/black/twenty = 10,
|
||||
/obj/item/soap/deluxe = 5
|
||||
)
|
||||
|
||||
/obj/effect/spawner/lootdrop/bluespace_tap/food
|
||||
name = "fancy food"
|
||||
lootcount = 3
|
||||
loot = list(
|
||||
/obj/item/food/wingfangchu,
|
||||
/obj/item/food/hotdog,
|
||||
/obj/item/food/sliceable/turkey,
|
||||
/obj/item/food/plumphelmetbiscuit,
|
||||
/obj/item/food/appletart,
|
||||
/obj/item/food/sliceable/cheesecake,
|
||||
/obj/item/food/sliceable/bananacake,
|
||||
/obj/item/food/sliceable/chocolatecake,
|
||||
/obj/item/food/soup/meatballsoup,
|
||||
/obj/item/food/soup/mysterysoup,
|
||||
/obj/item/food/soup/stew,
|
||||
/obj/item/food/soup/hotchili,
|
||||
/obj/item/food/burrito,
|
||||
/obj/item/food/fishburger,
|
||||
/obj/item/food/cubancarp,
|
||||
/obj/item/food/fishandchips,
|
||||
/obj/item/food/meatpie,
|
||||
/obj/item/pizzabox/hawaiian, //it ONLY gives hawaiian. MUHAHAHA
|
||||
/obj/item/food/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
|
||||
)
|
||||
|
||||
/// Points generated per cycle for each Watt of power consumption
|
||||
#define POINTS_PER_W 4e-6
|
||||
/// Amount of points generated per cycle per 50KW for the first 500KW
|
||||
@@ -203,10 +79,10 @@
|
||||
|
||||
/// list of possible products
|
||||
var/static/product_list = list(
|
||||
new /datum/data/bluespace_tap_product("Unknown Exotic Hat", /obj/effect/spawner/lootdrop/bluespace_tap/hat, 5000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Snack", /obj/effect/spawner/lootdrop/bluespace_tap/food, 6000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Cultural Artifact", /obj/effect/spawner/lootdrop/bluespace_tap/cultural, 15000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Biological Artifact", /obj/effect/spawner/lootdrop/bluespace_tap/organic, 20000)
|
||||
new /datum/data/bluespace_tap_product("Unknown Exotic Hat", /obj/effect/spawner/random/bluespace_tap/hat, 5000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Snack", /obj/effect/spawner/random/bluespace_tap/food, 6000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Cultural Artifact", /obj/effect/spawner/random/bluespace_tap/cultural, 15000),
|
||||
new /datum/data/bluespace_tap_product("Unknown Biological Artifact", /obj/effect/spawner/random/bluespace_tap/organic, 20000)
|
||||
)
|
||||
|
||||
/// The amount of power being used for mining at the moment (Watts)
|
||||
|
||||
Reference in New Issue
Block a user