Skip to content

Commit

Permalink
Reduce number of loot crate spawners in debris field, increase freque…
Browse files Browse the repository at this point in the history
…ncy of loot crates while mining asteroids (including mineral magnet)
  • Loading branch information
flrsh committed Jul 25, 2022
1 parent 4c51d73 commit c02420a
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 98 deletions.
14 changes: 5 additions & 9 deletions code/modules/mining/mining_encounters.dm
Expand Up @@ -840,26 +840,22 @@
picker = rand(1,6)
switch(picker)
if (1 to 3)
I = new /obj/item/raw_material/scrap_metal
I.set_loc(pick(turfs_near_center))
I.setMaterial(scrap_material)
new /obj/storage/crate/loot(pick(turfs_near_center))
if (4)
I = new /obj/item/sheet(pick(turfs_near_center))
I.amount = rand(1,5)
I.setMaterial(scrap_material)
if (5)
if (prob(15))
if (prob(25))
Artifact_Spawn(pick(turfs_near_center))
else
I = new /obj/item/rods(pick(turfs_near_center))
I.amount = rand(2,10)
I.setMaterial(scrap_material)
if (6)
if (prob(15))
new /obj/storage/crate/loot(pick(turfs_near_center))
else
new /obj/item/cable_coil/cut(pick(turfs_near_center))

I = new /obj/item/raw_material/scrap_metal
I.set_loc(pick(turfs_near_center))
I.setMaterial(scrap_material)

return generated_turfs

Expand Down
2 changes: 2 additions & 0 deletions code/modules/mining/ore.dm
Expand Up @@ -206,6 +206,7 @@
/datum/ore/miracle
name = "miraclium"
output = /obj/item/raw_material/miracle
events = list(/datum/ore/event/loot_crate)
tiles_per_rock_min = 2
tiles_per_rock_max = 8
hardness_mod = 2
Expand Down Expand Up @@ -244,6 +245,7 @@
/datum/ore/nanite
name = "nanite cluster"
output = /obj/item/material_piece/cloth/carbon
events = list(/datum/ore/event/loot_crate)
tiles_per_rock_min = 5
tiles_per_rock_max = 15
hardness_mod = 2
Expand Down
64 changes: 18 additions & 46 deletions maps/oshan.dmm
Expand Up @@ -45201,10 +45201,6 @@
/obj/firedoor_spawn,
/turf/simulated/floor/plating/random,
/area/station/crew_quarters/arcade)
"glf" = (
/obj/landmark/spawner/loot,
/turf/simulated/floor/grime,
/area/space)
"glu" = (
/obj/decal/tile_edge/stripe/extra_big{
dir = 10
Expand All @@ -45225,7 +45221,7 @@
},
/area/station/medical/staff)
"gog" = (
/obj/landmark/spawner/loot,
/obj/reagent_dispensers/foamtank,
/turf/simulated/floor/grime,
/area/iss)
"gpP" = (
Expand Down Expand Up @@ -45682,11 +45678,6 @@
},
/turf/simulated/floor/plating/random,
/area/station/maintenance/southwest)
"jcZ" = (
/obj/landmark/spawner/loot,
/obj/landmark/spawner/loot,
/turf/simulated/floor/plating/airless/asteroid,
/area/space)
"jdK" = (
/obj/machinery/light_switch/auto,
/turf/simulated/floor,
Expand Down Expand Up @@ -46783,18 +46774,13 @@
/turf/simulated/floor/plating/random,
/area/station/maintenance/northwest)
"oXE" = (
/obj/landmark/spawner/loot,
/turf/simulated/floor/damaged2,
/area/skeleton_trader)
"oXV" = (
/turf/simulated/floor/redwhite{
dir = 8
},
/area/station/medical/medbay/surgery/storage)
"oZt" = (
/obj/landmark/spawner/loot,
/turf/simulated/floor/grime,
/area/skeleton_trader)
"pdH" = (
/obj/loudspeaker{
layer = 4;
Expand Down Expand Up @@ -46970,7 +46956,6 @@
/area/station/medical/medbay/lobby)
"pOZ" = (
/obj/decal/cleanable/robot_debris,
/obj/landmark/spawner/loot,
/turf/simulated/floor/airless/plating/damaged1,
/area/space)
"pPb" = (
Expand Down Expand Up @@ -47004,10 +46989,6 @@
},
/turf/simulated/floor/plating/random,
/area/station/maintenance/inner/central)
"pZV" = (
/obj/landmark/spawner/loot,
/turf/simulated/floor/red,
/area/space)
"qaf" = (
/obj/landmark/gps_waypoint,
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -47417,10 +47398,6 @@
/obj/machinery/networked/storage/scanner,
/turf/simulated/floor/plating/random,
/area/research_outpost/maint)
"ssS" = (
/obj/landmark/spawner/loot,
/turf/simulated/floor/airless/plating/damaged1,
/area/space)
"sBu" = (
/obj/cable{
d1 = 4;
Expand Down Expand Up @@ -48285,11 +48262,6 @@
/obj/landmark/random_room/size3x3,
/turf/simulated/floor/plating/random,
/area/station/maintenance/inner/central)
"yeA" = (
/obj/landmark/spawner/loot,
/obj/machinery/light/small/floor/cool,
/turf/simulated/floor/grime,
/area/iss)
"yfC" = (
/obj/table/reinforced/auto,
/obj/item/shipcomponent/mainweapon/taser,
Expand Down Expand Up @@ -50904,7 +50876,7 @@ buR
buR
buR
byc
pZV
byc
byc
byc
buR
Expand Down Expand Up @@ -52112,7 +52084,7 @@ buR
byD
bTw
fWc
fWc
bzD
bWe
byD
buR
Expand Down Expand Up @@ -52715,7 +52687,7 @@ bBW
buR
byD
bzD
fWc
bzD
fWc
bzD
byD
Expand Down Expand Up @@ -53924,7 +53896,7 @@ buR
buR
byc
byc
pZV
byc
byc
buR
buR
Expand Down Expand Up @@ -58849,7 +58821,7 @@ bTS
bTZ
bUc
bUc
oZt
bUc
bTS
boe
bTH
Expand Down Expand Up @@ -59911,9 +59883,9 @@ aqn
aUm
aUm
gog
gog
yeA
gog
aVt
aVS
aUL
aUm
aUm
aqn
Expand Down Expand Up @@ -73042,7 +73014,7 @@ aqn
aqn
aqn
aTs
shL
aqn
aqn
aqn
aqn
Expand Down Expand Up @@ -78901,7 +78873,7 @@ aqn
aqn
aqn
bnE
ssS
bCx
bCx
bnE
aqn
Expand Down Expand Up @@ -83301,7 +83273,7 @@ boe
boe
boe
buR
tQo
boe
boe
boe
boe
Expand Down Expand Up @@ -83603,7 +83575,7 @@ buR
boe
boe
buR
tQo
boe
boe
boe
boe
Expand Down Expand Up @@ -84502,7 +84474,7 @@ boe
boe
buR
buR
tQo
boe
boe
boe
boe
Expand Down Expand Up @@ -84804,7 +84776,7 @@ boe
buR
buR
buR
jcZ
boe
boe
boe
buR
Expand Down Expand Up @@ -85712,7 +85684,7 @@ boe
boe
boe
buR
boe
tQo
boe
bxZ
boe
Expand Down Expand Up @@ -88174,7 +88146,7 @@ aqn
aqn
aqn
aqn
shL
aqn
aTs
aTs
aTs
Expand Down Expand Up @@ -113323,7 +113295,7 @@ bQc
bQz
aUZ
bPD
glf
bPD
aUZ
aUZ
aqn
Expand Down

0 comments on commit c02420a

Please sign in to comment.