diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a915a89c73..e64505df7e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -61,37 +61,32 @@ new /obj/item/guardiancreator(src) /obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents() - var/loot = rand(1,11) + var/loot = rand(1,10) switch(loot) if(1) new /obj/item/clothing/suit/space/hardsuit/cult(src) if(2) new /obj/item/katana/lavaland(src) if(3) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) - else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) - if(4) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(5) + if(4) new /obj/item/nullrod/scythe/talking(src) - if(6) + if(5) new /obj/item/nullrod/armblade(src) - if(7) + if(6) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(8) + if(7) new /obj/item/grenade/clusterbuster/inferno(src) - if(9) + if(8) new /obj/item/gun/magic/wand/book/shock(src) - if(10) + if(9) new /obj/item/gun/magic/wand/book/page(src) - if(11) + if(10) new /obj/item/gun/magic/wand/book/spark(src) /obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() - var/loot = rand(1,14) + var/loot = rand(1,12) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -106,31 +101,21 @@ if(6) new /obj/item/jacobs_ladder(src) if(7) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) - else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) - if(8) new /obj/item/wisp_lantern(src) - if(9) + if(8) new /obj/item/pickaxe/rosegold(src) - if(10) + if(9) new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) - if(11) + if(10) new /obj/item/disk/tech_disk/illegal(src) - if(12) + if(11) new /obj/item/clothing/suit/space/hardsuit/cult(src) - if(13) + if(12) new /obj/item/katana/lavaland(src) - if(14) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) - else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) /obj/structure/closet/crate/necropolis/tendril/all/PopulateContents() - var/loot = rand(1,29) + var/loot = rand(1,28) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -145,56 +130,51 @@ if(6) new /obj/item/jacobs_ladder(src) if(7) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) - else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) - if(8) new /obj/item/wisp_lantern(src) - if(9) + if(8) new /obj/item/pickaxe/rosegold(src) - if(10) + if(9) new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) - if(11) + if(10) new /obj/item/disk/tech_disk/illegal(src) - if(12) + if(11) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(13) + if(12) new /obj/item/nullrod/scythe/talking(src) - if(14) + if(13) new /obj/item/nullrod/armblade(src) - if(15) + if(14) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(16) + if(15) new /obj/item/grenade/clusterbuster/inferno(src) - if(17) + if(16) new /obj/item/gun/magic/wand/book/shock(src) - if(18) + if(17) new /obj/item/gun/magic/wand/book/page(src) - if(19) + if(18) new /obj/item/gun/magic/wand/book/spark(src) - if(20) + if(19) new /obj/item/soulstone/anybody(src) - if(21) + if(20) new /obj/item/rod_of_asclepius(src) - if(22) + if(21) new /obj/item/organ/heart/cursed/wizard(src) - if(23) + if(22) new /obj/item/book/granter/spell/summonitem(src) - if(24) + if(23) new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/bedsheet/cult(src) - if(25) + if(24) new /obj/item/clothing/neck/necklace/memento_mori(src) - if(26) + if(25) new /obj/item/warp_cube/red(src) - if(27) + if(26) new /obj/item/immortality_talisman(src) - if(28) + if(27) new /obj/item/gun/magic/wand/book/healing(src) - if(29) + if(28) new /obj/item/guardiancreator(src) //KA modkit design discs diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index a60c5504e6..e6c5e7c22b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -40,8 +40,10 @@ Difficulty: Medium ranged = 1 ranged_cooldown_time = 16 pixel_x = -16 - crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye) - loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka) + crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye, /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) + loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) wander = FALSE del_on_death = TRUE blood_volume = BLOOD_VOLUME_NORMAL diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 2bcca74f30..64e1399e19 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -26,8 +26,10 @@ Difficulty: Extremely Hard speed = 20 move_to_delay = 20 ranged = TRUE - crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman) - loot = list(/obj/effect/decal/remains/plasma) + crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) + loot = list(/obj/effect/decal/remains/plasma, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) wander = FALSE del_on_death = TRUE blood_volume = BLOOD_VOLUME_NORMAL