Merge pull request #28966 from ChangelingRain/minerruins

Actually adds the blood-drunk miner ruins
This commit is contained in:
Jordan Brown
2017-07-02 22:57:57 -04:00
committed by GitHub
5 changed files with 1122 additions and 4 deletions
@@ -0,0 +1,362 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/mineral/volcanic,
/area/lavaland/surface/outdoors)
"c" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/structure/stone_tile/block{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
/obj/structure/stone_tile{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"f" = (
/obj/structure/stone_tile/cracked{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"g" = (
/obj/structure/stone_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"h" = (
/obj/structure/stone_tile/block{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"i" = (
/obj/structure/stone_tile{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"j" = (
/obj/structure/stone_tile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"k" = (
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"l" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"m" = (
/obj/structure/stone_tile/cracked{
dir = 8
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"n" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"o" = (
/obj/structure/stone_tile/block,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"p" = (
/obj/structure/stone_tile/block/cracked{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"q" = (
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"r" = (
/obj/structure/stone_tile/block{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"s" = (
/obj/structure/stone_tile/block,
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/open/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"t" = (
/obj/structure/stone_tile/surrounding/cracked{
dir = 6
},
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
dir = 1
},
/turf/open/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"u" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile/block/cracked,
/turf/open/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"w" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile/block/cracked{
dir = 8
},
/turf/open/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"x" = (
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile/block{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"y" = (
/obj/structure/stone_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
a
b
b
b
b
b
b
a
a
a
a
a
"}
(2,1,1) = {"
a
a
b
b
c
c
b
b
b
b
b
b
a
a
"}
(3,1,1) = {"
b
b
b
c
d
c
c
b
b
b
b
b
b
a
"}
(4,1,1) = {"
b
b
c
c
k
o
c
c
c
c
b
b
b
b
"}
(5,1,1) = {"
b
c
d
g
c
p
c
v
c
c
c
c
b
b
"}
(6,1,1) = {"
b
c
c
h
l
e
s
j
c
d
e
c
c
b
"}
(7,1,1) = {"
b
c
c
c
c
q
t
w
x
y
p
e
c
b
"}
(8,1,1) = {"
b
c
e
i
m
j
u
e
c
f
d
y
c
b
"}
(9,1,1) = {"
b
c
f
j
c
r
c
o
c
c
c
c
b
b
"}
(10,1,1) = {"
b
b
c
c
c
o
c
c
b
b
c
b
b
b
"}
(11,1,1) = {"
b
b
b
c
n
c
c
b
b
b
b
b
b
a
"}
(12,1,1) = {"
a
b
b
c
c
c
b
b
b
b
b
a
a
a
"}
(13,1,1) = {"
a
a
b
b
b
b
b
a
a
a
a
a
a
a
"}
@@ -0,0 +1,364 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/mineral/volcanic,
/area/lavaland/surface/outdoors)
"c" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/structure/stone_tile/block{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"f" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"g" = (
/obj/structure/stone_tile{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"h" = (
/obj/structure/stone_tile/block/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"i" = (
/obj/structure/stone_tile/surrounding_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"j" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"k" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"l" = (
/obj/structure/stone_tile/surrounding_tile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"m" = (
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"n" = (
/obj/structure/stone_tile/block{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"o" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"p" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile/block/cracked{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"q" = (
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"r" = (
/obj/structure/stone_tile/block{
dir = 8
},
/obj/structure/stone_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"s" = (
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"t" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"u" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/structure/stone_tile/block/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"w" = (
/obj/structure/stone_tile/block,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"x" = (
/obj/structure/stone_tile/block/cracked{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"y" = (
/obj/structure/stone_tile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"z" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"A" = (
/obj/structure/stone_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
b
b
b
b
a
b
b
a
a
a
a
a
a
"}
(2,1,1) = {"
a
b
b
b
b
b
b
b
b
b
b
a
a
a
a
"}
(3,1,1) = {"
b
b
c
h
k
f
f
f
k
f
b
b
a
a
a
"}
(4,1,1) = {"
b
b
d
c
l
f
f
f
v
f
b
b
b
a
a
"}
(5,1,1) = {"
b
b
e
i
m
k
f
u
w
f
f
b
b
b
a
"}
(6,1,1) = {"
a
b
f
f
f
o
r
q
w
f
f
f
f
b
b
"}
(7,1,1) = {"
b
b
b
f
f
p
s
t
f
f
q
n
A
f
b
"}
(8,1,1) = {"
b
b
g
f
c
q
t
q
k
x
f
z
d
f
b
"}
(9,1,1) = {"
a
b
f
j
n
j
f
e
n
y
f
n
y
b
b
"}
(10,1,1) = {"
a
b
b
f
f
f
f
f
f
b
b
f
f
b
b
"}
(11,1,1) = {"
a
a
b
b
b
b
b
b
b
b
b
b
b
b
a
"}
(12,1,1) = {"
a
a
a
b
b
b
b
b
b
a
a
b
b
a
a
"}
@@ -0,0 +1,365 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/mineral/volcanic,
/area/lavaland/surface/outdoors)
"c" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/structure/stone_tile/block{
dir = 8
},
/obj/structure/stone_tile/block{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
/obj/structure/stone_tile/block{
dir = 8
},
/obj/structure/stone_tile/block/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"f" = (
/obj/structure/stone_tile/block{
dir = 4
},
/obj/structure/stone_tile/block/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"g" = (
/obj/structure/stone_tile{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"h" = (
/obj/structure/stone_tile{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"i" = (
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"j" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile/cracked{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"k" = (
/obj/structure/stone_tile/cracked,
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"l" = (
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile,
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"m" = (
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"n" = (
/obj/structure/stone_tile/block{
dir = 8
},
/obj/structure/stone_tile/block{
dir = 4
},
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"o" = (
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"p" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile/cracked{
dir = 8
},
/obj/structure/stone_tile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"q" = (
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile/cracked,
/obj/structure/stone_tile{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"r" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"s" = (
/obj/structure/stone_tile/surrounding_tile/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"t" = (
/obj/structure/stone_tile/block/cracked,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"u" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 8
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/structure/stone_tile/surrounding/cracked{
dir = 6
},
/obj/structure/stone_tile/center,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
a
a
a
a
a
a
b
b
b
b
b
a
a
a
"}
(2,1,1) = {"
a
b
b
b
a
a
b
b
b
c
c
b
b
b
a
a
"}
(3,1,1) = {"
b
b
b
b
b
b
b
b
c
g
m
c
c
b
b
a
"}
(4,1,1) = {"
b
c
c
b
b
b
c
c
g
k
h
q
c
c
b
b
"}
(5,1,1) = {"
b
c
c
c
c
c
c
g
i
c
c
h
s
c
c
b
"}
(6,1,1) = {"
b
d
e
e
d
f
d
f
e
d
n
f
t
v
c
b
"}
(7,1,1) = {"
b
c
c
c
c
c
c
h
j
c
c
o
u
c
b
b
"}
(8,1,1) = {"
b
b
b
c
c
c
c
c
h
l
o
r
c
b
b
b
"}
(9,1,1) = {"
a
b
b
b
b
c
c
c
c
h
p
c
c
b
b
a
"}
(10,1,1) = {"
a
a
a
b
b
b
b
b
c
c
c
c
b
b
a
a
"}
(11,1,1) = {"
a
a
a
a
a
b
b
b
b
b
b
b
b
b
a
a
"}
+16
View File
@@ -123,6 +123,22 @@
cost = -1
allow_duplicates = FALSE
/datum/map_template/ruin/lavaland/blood_drunk_miner
name = "Blood-Drunk Miner"
id = "blooddrunk"
description = "A strange arrangement of stone tiles and an insane, beastly miner contemplating them."
suffix = "lavaland_surface_blooddrunk1.dmm"
cost = 0
allow_duplicates = FALSE //will only spawn one variant of the ruin
/datum/map_template/ruin/lavaland/blood_drunk_miner/guidance
name = "Blood-Drunk Miner (Guidance)"
suffix = "lavaland_surface_blooddrunk2.dmm"
/datum/map_template/ruin/lavaland/blood_drunk_miner/hunter
name = "Blood-Drunk Miner (Hunter)"
suffix = "lavaland_surface_blooddrunk3.dmm"
/datum/map_template/ruin/lavaland/ufo_crash
name = "UFO Crash"
id = "ufo-crash"
@@ -41,16 +41,24 @@ Difficulty: Medium
loot = list(/obj/item/weapon/melee/transforming/cleaving_saw, /obj/item/weapon/gun/energy/kinetic_accelerator)
wander = FALSE
del_on_death = TRUE
stat_attack = UNCONSCIOUS
blood_volume = BLOOD_VOLUME_NORMAL
medal_type = MEDAL_PREFIX
var/obj/item/weapon/melee/transforming/cleaving_saw/miner/miner_saw
var/time_until_next_transform
var/dashing = FALSE
var/dash_cooldown = 15
var/guidance = FALSE
deathmessage = "falls to the ground, decaying into glowing particles."
death_sound = "bodyfall"
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance
guidance = TRUE
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget()
. = ..()
if(. && prob(12))
INVOKE_ASYNC(src, .proc/dash)
/obj/item/weapon/melee/transforming/cleaving_saw/miner //nerfed saw because it is very murdery
force = 6
force_on = 10
@@ -108,15 +116,18 @@ Difficulty: Medium
visible_message("<span class='danger'>[src] butchers [L]!</span>",
"<span class='userdanger'>You butcher [L], restoring your health!</span>")
if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station
adjustBruteLoss(-L.maxHealth/2)
if(guidance)
adjustHealth(-L.maxHealth)
else
adjustHealth(-(L.maxHealth * 0.5))
L.gib()
return TRUE
changeNext_move(CLICK_CD_MELEE)
miner_saw.melee_attack_chain(src, target)
if(guidance)
adjustHealth(-2)
transform_weapon()
INVOKE_ASYNC(src, .proc/quick_attack_loop)
if(prob(10))
INVOKE_ASYNC(src, .proc/dash)
return TRUE
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)