From d4647b9e1efa77ee3adc4d90accafbbec92399f7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 23:32:24 -0500 Subject: [PATCH] Update necropolis_chests.dm --- .../mining/lavaland/necropolis_chests.dm | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 1b2970ce1c..75fe0681ab 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -28,7 +28,10 @@ if(7) new /obj/item/pickaxe/diamond(src) if(8) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) + 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(9) new /obj/item/organ/brain/alien(src) if(10) @@ -38,7 +41,7 @@ if(12) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src) if(13) - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) + new /obj/item/jacobs_ladder(src) if(14) new /obj/item/nullrod/scythe/talking(src) if(15) @@ -46,7 +49,10 @@ if(16) new /obj/item/guardiancreator(src) if(17) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) + 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(18) new /obj/item/device/warp_cube/red(src) if(19) @@ -69,8 +75,7 @@ if(27) new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/bedsheet/cult(src) - if(28) - new /obj/item/disk/design_disk/modkit_disc/bounty(src) + //KA modkit design discs /obj/item/disk/design_disk/modkit_disc @@ -563,9 +568,6 @@ ..() -<<<<<<< HEAD - -======= /obj/item/jacobs_ladder name = "jacob's ladder" desc = "A celestial ladder that violates the laws of physics." @@ -587,7 +589,6 @@ name = "jacob's ladder" desc = "An indestructible celestial ladder that violates the laws of physics." auto_connect = TRUE ->>>>>>> 7c553c6... Span ///Bosses @@ -1287,3 +1288,5 @@ for(var/t in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check) B.damage = 15 //keeps monster damage boost due to lower damage + +