Merge pull request #2702 from Citadel-Station-13/upstream-merge-30548

[MIRROR] Magic Ladder
This commit is contained in:
LetterJay
2017-09-17 08:55:41 -05:00
committed by GitHub
@@ -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)
@@ -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."
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, "<span class='notice'>You unfold the ladder. It extends much farther than you were expecting.</span>")
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."
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