cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 05:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10351 from VOREStation/upstream-merge-8082

Browse Source 
[MIRROR] More Spawner Tweaks
This commit is contained in:
Novacat
2021-05-18 08:31:07 -04:00
committed by Chompstation Bot
parent 129eaeade4
commit b98bab980f
3 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/mapping.dm
+49
View File
@@ -464,6 +464,18 @@
/obj/random/multiple/ore_pile/item_to_spawn()
return pick(
prob(10);list(
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite,
/obj/item/weapon/ore/bauxite
),
prob(10);list(
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal,
@@ -476,6 +488,18 @@
/obj/item/weapon/ore/coal,
/obj/item/weapon/ore/coal
),
prob(10);list(
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper,
/obj/item/weapon/ore/copper
),
prob(3);list(
/obj/item/weapon/ore/diamond,
/obj/item/weapon/ore/diamond,
@@ -552,6 +576,13 @@
/obj/item/weapon/ore/phoron,
/obj/item/weapon/ore/phoron
),
prob(5);list(
/obj/item/weapon/ore/rutile,
/obj/item/weapon/ore/rutile,
/obj/item/weapon/ore/rutile,
/obj/item/weapon/ore/rutile,
/obj/item/weapon/ore/rutile
),
prob(5);list(
/obj/item/weapon/ore/silver,
/obj/item/weapon/ore/silver,
@@ -568,6 +599,10 @@
/obj/item/weapon/ore/verdantium,
/obj/item/weapon/ore/verdantium
),
prob(2);list(
/obj/item/weapon/ore/void_opal,
/obj/item/weapon/ore/void_opal
),
)
/obj/random/multiple/corp_crate
@@ -849,6 +884,13 @@
/obj/random/grenade,
/obj/structure/closet/crate/secure/saare //SAARE GRENADES
),
prob(1);list(
/obj/random/material/precious,
/obj/random/material/precious,
/obj/random/material/precious,
/obj/random/material/precious,
/obj/structure/closet/crate/secure/saare //SAARE BULLION CRATE
),
prob(1);list(
/obj/random/cash/big,
/obj/random/cash/big,
@@ -1093,6 +1135,13 @@
/obj/item/weapon/tank/phoron/pressurized,
/obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS
),
prob(1);list(
/obj/random/material/precious,
/obj/random/material/precious,
/obj/random/material/precious,
/obj/random/material/precious,
/obj/structure/closet/crate/secure/saare //SAARE BULLION CRATE
),
prob(1);list(
/obj/random/cash/big,
/obj/random/cash/big,
code/game/objects/random/misc.dm
+18
View File
@@ -498,8 +498,11 @@
/obj/item/stack/material/glass/reinforced{amount = 10},
/obj/item/stack/material/plastic{amount = 10},
/obj/item/stack/material/wood{amount = 10},
/obj/item/stack/material/wood/sif{amount = 10},
/obj/item/stack/material/cardboard{amount = 10},
/obj/item/stack/rods{amount = 10},
/obj/item/stack/material/sandstone{amount = 10},
/obj/item/stack/material/marble{amount = 10},
/obj/item/stack/material/plasteel{amount = 10})
/obj/random/material/refined //Random materials for building stuff
@@ -518,6 +521,8 @@
/obj/item/stack/material/durasteel{amount = 5},
/obj/item/stack/material/gold{amount = 5},
/obj/item/stack/material/iron{amount = 10},
/obj/item/stack/material/copper{amount = 10},
/obj/item/stack/material/aluminium{amount = 10},
/obj/item/stack/material/lead{amount = 10},
/obj/item/stack/material/diamond{amount = 3},
/obj/item/stack/material/deuterium{amount = 5},
@@ -531,6 +536,19 @@
/obj/item/stack/material/tritium{amount = 3},
/obj/item/stack/material/verdantium{amount = 2})
/obj/random/material/precious //Precious metals, go figure
name = "random precious metal"
desc = "This is a small stack of a random precious metal."
icon = 'icons/obj/stacks.dmi'
icon_state = "sheet-gold_2"
/obj/random/material/precious/item_to_spawn()
return pick(/obj/item/stack/material/gold{amount = 5},
/obj/item/stack/material/copper{amount = 5},
/obj/item/stack/material/silver{amount = 5},
/obj/item/stack/material/platinum{amount = 5},
/obj/item/stack/material/osmium{amount = 5})
/obj/random/tank
name = "random tank"
desc = "This is a tank."