From 0dd3338881faa5d1cfb39a40d60d88d4c1772df3 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 9 Sep 2017 14:47:43 -0500 Subject: [PATCH 1/2] Magic Ladder --- .../mining/lavaland/necropolis_chests.dm | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index bf32c940589..55ddd883025 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,7 +568,27 @@ ..() +/obj/item/jacobs_ladder + name = "jacob's ladder" + desc = "A celestial ladder that violates the laws of physics, but respects the coordinate plane." + icon = 'icons/obj/structures.dmi' + icon_state = "ladder00" +/obj/item/jacobs_ladder/attack_self(mob/user) + var/turf/T = get_turf(src) + var/ladder_x = T.x + var/ladder_y = T.y + to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.") + for(var/i in 1 to world.maxz) + if(i == ZLEVEL_CENTCOM || i == ZLEVEL_TRANSIT) + continue + new /obj/structure/ladder/unbreakable/jacob(ladder_x, ladder_y, i) + qdel(src) + +/obj/structure/ladder/unbreakable/jacob + name = "jacob's ladder" + desc = "An indestructible celestial ladder that violates the laws of physics, but respects the coordinate plane." + auto_connect = TRUE ///Bosses @@ -1263,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 + + From 7c553c6d80e08afab61ae9d51c567ff1aff3204d Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 11 Sep 2017 10:07:49 -0500 Subject: [PATCH 2/2] Span --- code/modules/mining/lavaland/necropolis_chests.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 55ddd883025..75fe0681abf 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -11,7 +11,7 @@ desc = "It's watching you suspiciously." /obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,28) + var/loot = rand(1,27) switch(loot) if(1) new /obj/item/device/shared_storage/red(src) @@ -570,7 +570,7 @@ /obj/item/jacobs_ladder name = "jacob's ladder" - desc = "A celestial ladder that violates the laws of physics, but respects the coordinate plane." + desc = "A celestial ladder that violates the laws of physics." icon = 'icons/obj/structures.dmi' icon_state = "ladder00" @@ -578,7 +578,7 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y - to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.") + to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.") for(var/i in 1 to world.maxz) if(i == ZLEVEL_CENTCOM || i == ZLEVEL_TRANSIT) continue @@ -587,7 +587,7 @@ /obj/structure/ladder/unbreakable/jacob name = "jacob's ladder" - desc = "An indestructible celestial ladder that violates the laws of physics, but respects the coordinate plane." + desc = "An indestructible celestial ladder that violates the laws of physics." auto_connect = TRUE ///Bosses