diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 3d2df063b5..f0ac7c002e 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -18,6 +18,8 @@ generate_loot() +/* Vorestation edit - see abandonedcrates_vr.dm for virgo version. Keeping legacy proc in comments for reference. + /obj/structure/closet/crate/secure/loot/proc/generate_loot() var/loot = rand(1, 100) switch(loot) @@ -143,6 +145,9 @@ if(100) new/obj/item/device/personal_shield_generator/belt/mining/loaded(src) +vorestation edit end */ + + /obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob) if(!locked) return diff --git a/code/modules/mining/abandonedcrates_vr.dm b/code/modules/mining/abandonedcrates_vr.dm index 66bde0b4ff..7e4b8e2437 100644 --- a/code/modules/mining/abandonedcrates_vr.dm +++ b/code/modules/mining/abandonedcrates_vr.dm @@ -1,2 +1,173 @@ /obj/structure/closet/crate/secure/loot - tamper_proof = 2 \ No newline at end of file + tamper_proof = 2 + +/obj/structure/closet/crate/secure/loot/proc/generate_loot() + var/lootvalue = 0 + while(lootvalue <= 10) //if the initial generation gives you less than 10 points of stuff, add more stuff + //pick a thing to add to the crate - the format is "list(filepath, value) = weight," + var/choice = list() + choice = pickweight(list( + list(pick(/obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/uranium), 1) = 10, + list(pick(subtypesof(/obj/item/weapon/coin)), 2) = 10, + list(/obj/item/weapon/spacecash/c500, 4) = 5, + list(/obj/item/weapon/spacecash/c200, 2) = 10, + list(/obj/item/weapon/spacecash/c100, 1) = 10, + list(/obj/item/weapon/spacecash/c50, 1) = 10, + list(/obj/item/weapon/spacecash/c20, 1) = 10, + list(pick(subtypesof(/obj/item/weapon/reagent_containers/food/drinks/bottle/) - /obj/item/weapon/reagent_containers/food/drinks/bottle/small), 1) = 5, + list(/obj/item/weapon/storage/backpack/dufflebag/cratebooze,5) = 5, + list(/obj/item/weapon/storage/backpack/dufflebag/cratedrills, 5) = 5, + list(/obj/item/weapon/reagent_containers/glass/beaker/bluespace, 3) = 5, + list(/obj/item/weapon/reagent_containers/glass/beaker/noreact, 3) = 5, + list(/obj/item/weapon/melee/baton, 5) = 4, + list(pick(subtypesof(/obj/item/weapon/storage/mre)), 2) = 3, + list(/obj/item/seeds/random, 2) = 3, + list(/obj/item/clothing/under/chameleon, 5) = 3, + list(/obj/item/weapon/melee/classic_baton, 6) = 3, + list(/obj/item/weapon/rig/industrial, 6) = 3, + list(/obj/item/device/multitool/hacktool, 5) = 3, + list(/obj/item/toy/katana, 1) = 2, + list(/obj/item/clothing/head/kitty, 1) = 2, + list(pick(subtypesof(/obj/item/weapon/soap)), 1) = 2, + list(/obj/item/clothing/under/shorts/red, 1) = 2, + list(/obj/item/clothing/under/shorts/blue, 1) = 2, + list(/obj/item/clothing/accessory/tie/horrible, 1) = 2, + list(pick(subtypesof(/obj/item/weapon/stock_parts) - /obj/item/weapon/stock_parts/subspace), 2) = 3, + list(/obj/item/latexballon, 2) = 2, + list(/obj/item/toy/syndicateballoon, 3) = 2, + list(/obj/item/clothing/suit/ianshirt, 3) = 2, + list(/obj/item/clothing/head/bearpelt, 4) = 2, + list(/obj/item/weapon/archaeological_find, 3) = 2, + list(pick(subtypesof(/obj/item/toy/mecha)), 4) = 2, + list(pick(subtypesof(/obj/item/toy/figure)), 4) = 2, + list(pick(subtypesof(/obj/item/toy/plushie)), 4) = 2, + list(pick(subtypesof(/obj/item/weapon/storage/firstaid)), 4) = 2, + list(/obj/item/weapon/pickaxe/silver, 3) = 2, + list(/obj/item/weapon/pickaxe/drill, 3) = 2, + list(/obj/item/weapon/pickaxe/jackhammer, 4) = 2, + list(/obj/item/weapon/pickaxe/gold, 4) = 2, + list(/obj/item/weapon/pickaxe/diamond, 5) = 2, + list(/obj/item/weapon/pickaxe/diamonddrill, 6) = 2, + list(/obj/item/weapon/pickaxe/plasmacutter, 5) = 2, + list(/obj/item/device/soulstone, 5) = 2, + list(/obj/item/weapon/material/sword/katana, 5) = 2, + list(/obj/item/weapon/storage/belt/utility/chief/full, 8) = 2, + list(/obj/item/device/personal_shield_generator/belt/mining/loaded, 6) = 2, + list(pick(subtypesof(/obj/item/weapon/melee/energy/sword) - /obj/item/weapon/melee/energy/sword/charge), 6) = 2, + list(pick(/obj/item/weapon/dnainjector/xraymut, /obj/item/weapon/dnainjector/nobreath, /obj/item/weapon/dnainjector/insulation), 6) = 2, + list(/obj/item/weapon/gun/energy/netgun, 7) = 2, + list(pick(prob(300);/obj/item/weapon/gun/energy/mouseray, + prob(50);/obj/item/weapon/gun/energy/mouseray/corgi, + prob(50);/obj/item/weapon/gun/energy/mouseray/woof, + prob(50);/obj/item/weapon/gun/energy/mouseray/cat, + prob(50);/obj/item/weapon/gun/energy/mouseray/chicken, + prob(50);/obj/item/weapon/gun/energy/mouseray/lizard, + prob(50);/obj/item/weapon/gun/energy/mouseray/rabbit, + prob(50);/obj/item/weapon/gun/energy/mouseray/fennec, + prob(5);/obj/item/weapon/gun/energy/mouseray/monkey, + prob(5);/obj/item/weapon/gun/energy/mouseray/wolpin, + prob(5);/obj/item/weapon/gun/energy/mouseray/otie, + prob(5);/obj/item/weapon/gun/energy/mouseray/direwolf, + prob(5);/obj/item/weapon/gun/energy/mouseray/giantrat, + prob(50);/obj/item/weapon/gun/energy/mouseray/redpanda, + prob(5);/obj/item/weapon/gun/energy/mouseray/catslug, + prob(5);/obj/item/weapon/gun/energy/mouseray/teppi, + prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis, + prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random + ), 8) = 2, + list(/obj/item/weapon/gun/energy/pummeler, 11) = 2, + list(pick(subtypesof(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug)), 1) = 1, + list(/obj/item/xenos_claw, 1) = 1, + list(/obj/item/organ/internal/heart, 1) = 1, + list(/obj/item/weapon/vampiric, 2) = 1, + list(/obj/item/weed_extract, 2) = 1, + list(/obj/item/weapon/storage/backpack/luchador/loaded, 3) = 1, + list(/obj/item/weapon/storage/backpack/clown/loaded, 5) = 1, + list(/obj/item/weapon/storage/backpack/mime/loaded, 5) = 1, + list(pick(/obj/item/device/multitool/alien, + /obj/item/stack/cable_coil/alien, + /obj/item/weapon/tool/crowbar/alien, + /obj/item/weapon/tool/screwdriver/alien, + /obj/item/weapon/weldingtool/alien, + /obj/item/weapon/tool/wirecutters/alien, + /obj/item/weapon/tool/wrench/alien), 7) = 1, + list(pick(/obj/item/weapon/melee/energy/axe, /obj/item/weapon/melee/energy/spear), 11) = 1, + list(/obj/item/weapon/card/emag/used, 7) = 1, + list(pick(/obj/item/weapon/grenade/spawnergrenade/spesscarp, /obj/item/weapon/grenade/spawnergrenade/spider, /obj/item/weapon/grenade/explosive/frag), 7) = 1, + list(/obj/item/weapon/grenade/flashbang/clusterbang, 7) = 1, + list(/obj/item/weapon/card/emag, 11) = 1, + list(/obj/item/weapon/storage/backpack/sport/hyd/catchemall, 11) = 1 + )) + var/path = choice[1] + var/value = choice[2] + contents += new path() + lootvalue += value + +//putting the multi-object loot items as their own things + +/obj/item/weapon/storage/backpack/dufflebag/cratebooze + starts_with = list( + /obj/item/weapon/reagent_containers/food/drinks/bottle/rum, + /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + ) + +/obj/item/weapon/storage/backpack/dufflebag/cratedrills + starts_with = list( + /obj/item/weapon/pickaxe/advdrill, + /obj/item/device/taperecorder, + /obj/item/clothing/suit/space, + /obj/item/clothing/head/helmet/space + ) + +/obj/item/weapon/storage/backpack/clown/loaded + starts_with = list( + /obj/item/clothing/under/rank/clown, + /obj/item/clothing/shoes/clown_shoes, + /obj/item/device/pda/clown, + /obj/item/clothing/mask/gas/clown_hat, + /obj/item/weapon/bikehorn, + /obj/item/weapon/pen/crayon/rainbow, + /obj/item/weapon/reagent_containers/spray/waterflower + ) + +/obj/item/weapon/storage/backpack/mime/loaded + starts_with = list( + /obj/item/clothing/under/mime, + /obj/item/clothing/shoes/black, + /obj/item/device/pda/mime, + /obj/item/clothing/gloves/white, + /obj/item/clothing/mask/gas/mime, + /obj/item/clothing/head/beret, + /obj/item/clothing/suit/suspenders, + /obj/item/weapon/pen/crayon/mime, + /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing + ) + +/obj/item/weapon/storage/backpack/luchador/loaded + starts_with = list( + /obj/item/weapon/storage/belt/champion, + /obj/item/clothing/mask/luchador + ) + + +/obj/item/weapon/storage/backpack/sport/hyd/catchemall + name = "sports backpack" + desc = "A green sports backpack." + starts_with = list( + /obj/item/clothing/head/soft/red, + /obj/item/clothing/suit/varsity/blue, + /obj/item/clothing/under/pants/youngfolksjeans, + /obj/item/capture_crystal + ) + +/obj/item/weapon/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one) + ..() + var/path = pick(subtypesof(/obj/item/capture_crystal)) + contents += new path() \ No newline at end of file