mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-31 07:58:22 +01:00
Merge branch 'master' into upstream-merge-8298
This commit is contained in:
Novacat
@@ -154,10 +154,10 @@
|
||||
icon_state = "ammo"
|
||||
|
||||
/obj/random/ammo/item_to_spawn()
|
||||
return pick(prob(6);/obj/item/weapon/storage/box/beanbags,
|
||||
prob(2);/obj/item/weapon/storage/box/shotgunammo,
|
||||
prob(4);/obj/item/weapon/storage/box/shotgunshells,
|
||||
prob(1);/obj/item/weapon/storage/box/stunshells,
|
||||
return pick(prob(6);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
|
||||
prob(2);/obj/item/ammo_magazine/ammo_box/b12g,
|
||||
prob(4);/obj/item/ammo_magazine/ammo_box/b12g/pellet,
|
||||
prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,
|
||||
prob(2);/obj/item/ammo_magazine/m45,
|
||||
prob(4);/obj/item/ammo_magazine/m45/rubber,
|
||||
prob(4);/obj/item/ammo_magazine/m45/flash,
|
||||
@@ -315,8 +315,8 @@
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/item/weapon/gun/projectile/garand,
|
||||
/obj/item/ammo_magazine/m762garand,
|
||||
/obj/item/ammo_magazine/m762garand
|
||||
/obj/item/ammo_magazine/m762enbloc,
|
||||
/obj/item/ammo_magazine/m762enbloc
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/item/weapon/gun/projectile/revolvingrifle,
|
||||
@@ -489,11 +489,11 @@
|
||||
),
|
||||
prob(3);list(
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/slug,
|
||||
/obj/item/weapon/storage/box/shotgunammo
|
||||
/obj/item/ammo_magazine/ammo_box/b12g
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
|
||||
/obj/item/weapon/storage/box/shotgunammo
|
||||
/obj/item/ammo_magazine/ammo_box/b12g
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
/obj/random/vendordrink/item_to_spawn() //Not including coffee as it's more specific in usage.
|
||||
return pick (/obj/machinery/vending/cola,
|
||||
/obj/machinery/vending/cola/soft,
|
||||
/obj/machinery/vending/bepis,
|
||||
/obj/machinery/vending/bepis,
|
||||
/obj/machinery/vending/sovietsoda,
|
||||
/obj/machinery/vending/radren)
|
||||
//VOREStation Edit End
|
||||
@@ -351,8 +351,8 @@
|
||||
/obj/item/clothing/suit/armor/vest,
|
||||
/obj/item/weapon/gun/projectile/garand,
|
||||
/obj/item/weapon/gun/projectile/garand,
|
||||
/obj/item/ammo_magazine/m762garand,
|
||||
/obj/item/ammo_magazine/m762garand,
|
||||
/obj/item/ammo_magazine/m762enbloc,
|
||||
/obj/item/ammo_magazine/m762enbloc,
|
||||
/obj/structure/closet/crate/plastic
|
||||
),
|
||||
prob(2);list(
|
||||
@@ -1455,4 +1455,194 @@
|
||||
/obj/random/turf/lava/item_to_spawn()
|
||||
return pick(prob(5);/turf/simulated/floor/lava,
|
||||
prob(3);/turf/simulated/floor/outdoors/rocks/caves,
|
||||
prob(1);/turf/simulated/mineral)
|
||||
prob(1);/turf/simulated/mineral/ignore_mapgen/cave)
|
||||
|
||||
//VOREStation Add Start - Underdark stuff that would be cool if existed if the underdark doesn't.
|
||||
|
||||
/obj/random/underdark
|
||||
name = "random underdark loot"
|
||||
desc = "Random loot for Underdark."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "spickaxe"
|
||||
|
||||
/obj/random/underdark/item_to_spawn()
|
||||
return pick(prob(3);/obj/random/multiple/underdark/miningdrills,
|
||||
prob(3);/obj/random/multiple/underdark/ores,
|
||||
prob(2);/obj/random/multiple/underdark/treasure,
|
||||
prob(1);/obj/random/multiple/underdark/mechtool)
|
||||
|
||||
/obj/random/underdark/uncertain
|
||||
icon_state = "upickaxe"
|
||||
spawn_nothing_percentage = 65 //only 33% to spawn loot
|
||||
|
||||
/obj/random/multiple/underdark/miningdrills
|
||||
name = "random underdark mining tool loot"
|
||||
desc = "Random mining tool loot for Underdark."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "spickaxe"
|
||||
|
||||
/obj/random/multiple/underdark/miningdrills/item_to_spawn()
|
||||
return pick(
|
||||
prob(10);list(/obj/item/weapon/pickaxe/silver),
|
||||
prob(8);list(/obj/item/weapon/pickaxe/drill),
|
||||
prob(6);list(/obj/item/weapon/pickaxe/jackhammer),
|
||||
prob(5);list(/obj/item/weapon/pickaxe/gold),
|
||||
prob(4);list(/obj/item/weapon/pickaxe/plasmacutter),
|
||||
prob(2);list(/obj/item/weapon/pickaxe/diamond),
|
||||
prob(1);list(/obj/item/weapon/pickaxe/diamonddrill)
|
||||
)
|
||||
|
||||
/obj/random/multiple/underdark/ores
|
||||
name = "random underdark mining ore loot"
|
||||
desc = "Random mining utility loot for Underdark."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "satchel"
|
||||
|
||||
/obj/random/multiple/underdark/ores/item_to_spawn()
|
||||
return pick(
|
||||
prob(9);list(
|
||||
/obj/item/weapon/storage/bag/ore,
|
||||
/obj/item/weapon/shovel,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/glass,
|
||||
/obj/item/weapon/ore/hydrogen,
|
||||
/obj/item/weapon/ore/hydrogen,
|
||||
/obj/item/weapon/ore/hydrogen,
|
||||
/obj/item/weapon/ore/hydrogen,
|
||||
/obj/item/weapon/ore/hydrogen,
|
||||
/obj/item/weapon/ore/hydrogen
|
||||
),
|
||||
prob(7);list(
|
||||
/obj/item/weapon/storage/bag/ore,
|
||||
/obj/item/weapon/pickaxe,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium,
|
||||
/obj/item/weapon/ore/osmium
|
||||
),
|
||||
prob(4);list(
|
||||
/obj/item/clothing/suit/radiation,
|
||||
/obj/item/clothing/head/radiation,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium,
|
||||
/obj/item/weapon/ore/uranium),
|
||||
prob(2);list(
|
||||
/obj/item/device/flashlight/lantern,
|
||||
/obj/item/clothing/glasses/material,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond,
|
||||
/obj/item/weapon/ore/diamond
|
||||
),
|
||||
prob(1);list(
|
||||
/obj/item/weapon/mining_scanner,
|
||||
/obj/item/weapon/shovel/spade,
|
||||
/obj/item/weapon/ore/verdantium,
|
||||
/obj/item/weapon/ore/verdantium,
|
||||
/obj/item/weapon/ore/verdantium,
|
||||
/obj/item/weapon/ore/verdantium,
|
||||
/obj/item/weapon/ore/verdantium
|
||||
)
|
||||
)
|
||||
|
||||
/obj/random/multiple/underdark/treasure
|
||||
name = "random underdark treasure"
|
||||
desc = "Random treasure loot for Underdark."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "cashbag"
|
||||
|
||||
/obj/random/multiple/underdark/treasure/item_to_spawn()
|
||||
return pick(
|
||||
prob(5);list(
|
||||
/obj/random/coin,
|
||||
/obj/random/coin,
|
||||
/obj/random/coin,
|
||||
/obj/random/coin,
|
||||
/obj/random/coin,
|
||||
/obj/item/clothing/head/pirate
|
||||
),
|
||||
prob(4);list(
|
||||
/obj/item/weapon/storage/bag/cash,
|
||||
/obj/item/weapon/spacecash/c500,
|
||||
/obj/item/weapon/spacecash/c100,
|
||||
/obj/item/weapon/spacecash/c50
|
||||
),
|
||||
prob(3);list(
|
||||
/obj/item/clothing/head/hardhat/orange,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold,
|
||||
/obj/item/stack/material/gold),
|
||||
prob(1);list(
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/phoron,
|
||||
/obj/item/stack/material/diamond,
|
||||
/obj/item/stack/material/diamond,
|
||||
/obj/item/stack/material/diamond
|
||||
)
|
||||
)
|
||||
|
||||
/obj/random/multiple/underdark/mechtool
|
||||
name = "random underdark mech equipment"
|
||||
desc = "Random mech equipment loot for Underdark."
|
||||
icon = 'icons/mecha/mecha_equipment.dmi'
|
||||
icon_state = "mecha_clamp"
|
||||
|
||||
/obj/random/multiple/underdark/mechtool/item_to_spawn()
|
||||
return pick(
|
||||
prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill),
|
||||
prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp),
|
||||
prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator),
|
||||
prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged),
|
||||
prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid),
|
||||
prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult),
|
||||
prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser),
|
||||
prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged),
|
||||
prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
|
||||
)
|
||||
//VOREStation Add End
|
||||
@@ -734,7 +734,7 @@
|
||||
/obj/item/toy/snappop,
|
||||
/obj/item/toy/sword,
|
||||
/obj/item/toy/balloon,
|
||||
/obj/item/toy/crossbow,
|
||||
/obj/item/weapon/gun/projectile/revolver/toy/crossbow,
|
||||
/obj/item/toy/blink,
|
||||
/obj/item/weapon/reagent_containers/spray/waterflower,
|
||||
/obj/item/toy/eight_ball,
|
||||
|
||||
@@ -18,11 +18,12 @@
|
||||
spawn_nothing_percentage = 50
|
||||
|
||||
/obj/random/awayloot/item_to_spawn()
|
||||
return pick(prob(50);/obj/item/weapon/aliencoin,
|
||||
return pick(prob(50);/obj/item/weapon/aliencoin/basic,
|
||||
prob(40);/obj/item/weapon/aliencoin/silver,
|
||||
prob(30);/obj/item/weapon/aliencoin/gold,
|
||||
prob(20);/obj/item/weapon/aliencoin/phoron,
|
||||
prob(10);/obj/item/device/denecrotizer,
|
||||
prob(5);/obj/item/capture_crystal,
|
||||
prob(5);/obj/item/device/perfect_tele,
|
||||
prob(5);/obj/item/weapon/bluespace_harpoon,
|
||||
prob(1);/obj/item/weapon/cell/infinite,
|
||||
@@ -43,9 +44,59 @@
|
||||
prob(3);/obj/fiftyspawner/silver,
|
||||
prob(1);/obj/fiftyspawner/diamond,
|
||||
prob(5);/obj/fiftyspawner/phoron,
|
||||
prob(1);/obj/item/weapon/telecube/randomized
|
||||
prob(1);/obj/item/weapon/telecube/randomized,
|
||||
prob(1);/obj/item/capture_crystal/random
|
||||
)
|
||||
|
||||
/obj/random/awayloot/nofail
|
||||
name = "garunteed random away mission loot"
|
||||
spawn_nothing_percentage = 0
|
||||
|
||||
/obj/random/awayloot/looseloot
|
||||
/obj/random/awayloot/looseloot/item_to_spawn()
|
||||
return pick(prob(50);/obj/item/weapon/aliencoin,
|
||||
prob(40);/obj/item/weapon/aliencoin/silver,
|
||||
prob(30);/obj/item/weapon/aliencoin/gold,
|
||||
prob(20);/obj/item/weapon/aliencoin/phoron,
|
||||
prob(10);/obj/item/device/denecrotizer,
|
||||
prob(5);/obj/item/capture_crystal,
|
||||
prob(3);/obj/item/capture_crystal/great,
|
||||
prob(1);/obj/item/capture_crystal/ultra,
|
||||
prob(4);/obj/item/capture_crystal/random,
|
||||
prob(5);/obj/item/device/perfect_tele,
|
||||
prob(5);/obj/item/weapon/bluespace_harpoon,
|
||||
prob(1);/obj/item/weapon/cell/infinite,
|
||||
prob(1);/obj/item/weapon/cell/void,
|
||||
prob(1);/obj/item/weapon/cell/device/weapon/recharge/alien,
|
||||
prob(1);/obj/item/clothing/shoes/boots/speed,
|
||||
prob(1);/obj/item/device/nif,
|
||||
prob(1);/obj/item/device/paicard,
|
||||
prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie,
|
||||
prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo,
|
||||
prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
|
||||
prob(2);/obj/item/clothing/mask/gas/voice,
|
||||
prob(2);/obj/item/device/radio_jammer,
|
||||
prob(1);/obj/item/toy/bosunwhistle,
|
||||
prob(1);/obj/item/weapon/bananapeel,
|
||||
prob(5);/obj/fiftyspawner/platinum,
|
||||
prob(3);/obj/fiftyspawner/gold,
|
||||
prob(3);/obj/fiftyspawner/silver,
|
||||
prob(1);/obj/fiftyspawner/diamond,
|
||||
prob(5);/obj/fiftyspawner/phoron,
|
||||
prob(1);/obj/item/weapon/telecube/randomized,
|
||||
prob(10);/obj/random/empty_or_lootable_crate,
|
||||
prob(10);/obj/random/medical,
|
||||
prob(5);/obj/random/firstaid,
|
||||
prob(30);/obj/random/maintenance,
|
||||
prob(10);/obj/random/mre,
|
||||
prob(15);/obj/random/snack,
|
||||
prob(10);/obj/random/tech_supply,
|
||||
prob(15);/obj/random/tech_supply/component,
|
||||
prob(10);/obj/random/tool,
|
||||
prob(5);/obj/random/tool/power,
|
||||
prob(1);/obj/random/tool/alien,
|
||||
prob(5);/obj/random/weapon,
|
||||
prob(5);/obj/random/ammo_all,
|
||||
prob(3);/obj/random/projectile/random,
|
||||
prob(5);/obj/random/multiple/voidsuit
|
||||
)
|
||||
|
||||
@@ -240,6 +240,7 @@
|
||||
|
||||
/obj/random/mob/mouse/item_to_spawn()
|
||||
return pick(prob(15);/mob/living/simple_mob/animal/passive/mouse/white,
|
||||
prob(15);/mob/living/simple_mob/animal/passive/mouse/black,
|
||||
prob(30);/mob/living/simple_mob/animal/passive/mouse/brown,
|
||||
prob(30);/mob/living/simple_mob/animal/passive/mouse/gray,
|
||||
prob(30);/mob/living/simple_mob/animal/passive/mouse/rat)
|
||||
|
||||
@@ -96,8 +96,8 @@
|
||||
icon = 'icons/obj/ammo.dmi'
|
||||
icon_state = "666"
|
||||
/obj/random/ammo_all/item_to_spawn()
|
||||
return pick(prob(5);/obj/item/weapon/storage/box/shotgunammo,\
|
||||
prob(5);/obj/item/weapon/storage/box/shotgunshells,\
|
||||
return pick(prob(5);/obj/item/ammo_magazine/ammo_box/b12g,\
|
||||
prob(5);/obj/item/ammo_magazine/ammo_box/b12g/pellet,\
|
||||
prob(5);/obj/item/ammo_magazine/clip/c762,\
|
||||
prob(5);/obj/item/ammo_magazine/m380,\
|
||||
prob(5);/obj/item/ammo_magazine/m45,\
|
||||
@@ -111,24 +111,25 @@
|
||||
prob(4);/obj/item/ammo_magazine/m9mmp90,\
|
||||
prob(4);/obj/item/ammo_magazine/m10mm,\
|
||||
prob(4);/obj/item/ammo_magazine/m545/small,\
|
||||
prob(3);/obj/item/ammo_magazine/clip/c10mm,\
|
||||
prob(3);/obj/item/ammo_magazine/clip/c44,\
|
||||
prob(3);/obj/item/ammo_magazine/ammo_box/b10mm/emp,\
|
||||
prob(3);/obj/item/ammo_magazine/ammo_box/b10mm,\
|
||||
prob(3);/obj/item/ammo_magazine/s44,\
|
||||
prob(3);/obj/item/ammo_magazine/m762,\
|
||||
prob(3);/obj/item/ammo_magazine/m545,\
|
||||
prob(3);/obj/item/weapon/cell/device/weapon,\
|
||||
prob(2);/obj/item/ammo_magazine/m44,\
|
||||
prob(2);/obj/item/ammo_magazine/s357,\
|
||||
prob(2);/obj/item/ammo_magazine/m762m,\
|
||||
prob(2);/obj/item/ammo_magazine/m762/ext,\
|
||||
prob(2);/obj/item/ammo_magazine/clip/c12g,
|
||||
prob(2);/obj/item/ammo_magazine/clip/c12g/pellet,\
|
||||
prob(1);/obj/item/ammo_magazine/m45tommy,\
|
||||
/* prob(1);/obj/item/ammo_magazine/m95,\ */
|
||||
prob(1);/obj/item/ammo_casing/rocket,\
|
||||
prob(1);/obj/item/weapon/storage/box/sniperammo,\
|
||||
prob(1);/obj/item/weapon/storage/box/flashshells,\
|
||||
prob(1);/obj/item/weapon/storage/box/beanbags,\
|
||||
prob(1);/obj/item/weapon/storage/box/stunshells,\
|
||||
prob(1);/obj/item/ammo_magazine/ammo_box/b145,\
|
||||
prob(1);/obj/item/ammo_magazine/ammo_box/b12g/flash,\
|
||||
prob(1);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,\
|
||||
prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,\
|
||||
prob(1);/obj/item/ammo_magazine/mtg,\
|
||||
prob(1);/obj/item/ammo_magazine/m12gdrum,\
|
||||
prob(1);/obj/item/ammo_magazine/m12gdrum/pellet,\
|
||||
|
||||
@@ -227,6 +227,7 @@
|
||||
/obj/item/clothing/suit/space/void/refurb/pilot,
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/pilot
|
||||
),
|
||||
|
||||
prob(10);list(
|
||||
/obj/item/clothing/suit/space/void/refurb/pilot,
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/pilot/alt
|
||||
@@ -239,6 +240,10 @@
|
||||
/obj/item/clothing/suit/space/void/refurb/research,
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/research/alt
|
||||
),
|
||||
prob(10);list(
|
||||
/obj/item/clothing/suit/space/void/refurb/mining,
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/mining
|
||||
),
|
||||
prob(5);list(
|
||||
/obj/item/clothing/suit/space/void/refurb/mercenary,
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/mercenary
|
||||
|
||||
Reference in New Issue
Block a user