From 338a98972fade6602a294cbf5bfa7569f99e439f Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Fri, 16 Nov 2018 22:34:34 -0600 Subject: [PATCH] Makes the ruin more of a challenge. --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 145 +++++++++--------- .../living/simple_animal/hostile/hivebot.dm | 18 +-- 2 files changed, 81 insertions(+), 82 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 9f817869de..ef36495c58 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1057,15 +1057,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) -"db" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot/range, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "dc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3947,7 +3938,6 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot/rapid, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) "jz" = ( @@ -4720,6 +4710,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/sec) +"ni" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "nk" = ( /obj/machinery/door/airlock/highsecurity, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -4776,11 +4773,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) -"rn" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot/strong, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/ancientstation/proto) "rv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4827,13 +4819,6 @@ }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation/rnd) -"wr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "wC" = ( /obj/structure/particle_accelerator/power_box, /obj/effect/decal/cleanable/dirt, @@ -4846,11 +4831,6 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) -"yJ" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot/engineering, -/turf/open/floor/plating, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "zh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, @@ -4872,6 +4852,11 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) +"Ax" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation/rnd) "BH" = ( /obj/structure/particle_accelerator/particle_emitter/left, /obj/effect/decal/cleanable/dirt, @@ -4883,6 +4868,11 @@ }, /turf/template_noop, /area/space/nearstation) +"Do" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot/strong, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation/proto) "FH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror{ @@ -4899,15 +4889,6 @@ /obj/structure/transit_tube/crossing/horizontal, /turf/template_noop, /area/space/nearstation) -"Ig" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "It" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink{ @@ -4920,11 +4901,6 @@ }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation) -"Iu" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot/range, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/ancientstation/rnd) "Ka" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -5005,15 +4981,6 @@ }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation) -"NL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/ancientstation/deltacorridor) "OA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -5044,15 +5011,6 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) -"PF" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/hivebot, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/ancientstation/rnd) -"PG" = ( -/mob/living/simple_animal/hostile/hivebot/engineering, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/ancientstation/hivebot) "PV" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" @@ -5101,6 +5059,20 @@ }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation) +"Un" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/ancientstation/deltacorridor) +"UF" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot/range, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/ancientstation/rnd) "Vs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -5113,6 +5085,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) +"Wq" = ( +/mob/living/simple_animal/hostile/hivebot/engineering, +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/ancientstation/hivebot) +"Xk" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot/engineering, +/turf/open/floor/plating, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "XJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5144,6 +5125,15 @@ /obj/item/soap/nanotrasen, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation) +"Zk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot/rapid, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/ancientstation/deltacorridor) "ZE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -5153,6 +5143,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation) +"ZY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav/ancientstation/deltacorridor) (1,1,1) = {" aa @@ -8053,7 +8052,7 @@ cA cZ dx dX -wr +ni hD dX dX @@ -8062,7 +8061,7 @@ dX hD dX dX -dX +ni dx dX dB @@ -8187,14 +8186,14 @@ aq ah ah ah -PG +Wq ah ah ad bE bD cD -NL +ZY dy dZ eA @@ -8258,7 +8257,7 @@ eb fV dy jv -Ig +Un jV kf kv @@ -8295,7 +8294,7 @@ dy fo dZ dZ -Iu +UF zh gO hh @@ -8305,7 +8304,7 @@ ip iF eb dy -db +dc cD jV kg @@ -8353,11 +8352,11 @@ gO eb fU jc -dc +Zk jM jW kh -rn +Do kw kS lb @@ -8424,7 +8423,7 @@ ac ad ag ah -PG +Wq ah ah ah @@ -8486,7 +8485,7 @@ de dy dZ eD -PF +Ax fx dZ gQ @@ -8687,7 +8686,7 @@ hI ca ca ca -ca +cF je jy ca @@ -8763,7 +8762,7 @@ ai aq ah ah -PG +Wq ah bp ad @@ -8825,7 +8824,7 @@ bD eZ eZ eZ -yJ +Xk dh dh dh diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 28056ce234..ece5d7e24c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -1,5 +1,5 @@ /obj/item/projectile/hivebotbullet - damage = 10 + damage = 15 damage_type = BRUTE /mob/living/simple_animal/hostile/hivebot @@ -11,11 +11,11 @@ icon_dead = "basic" gender = NEUTER mob_biotypes = list(MOB_ROBOTIC) - health = 40 - maxHealth = 40 + health = 50 + maxHealth = 50 healable = 0 - melee_damage_lower = 8 - melee_damage_upper = 8 + melee_damage_lower = 10 + melee_damage_upper = 10 attacktext = "saw" attack_sound = 'sound/weapons/bladeslice.ogg' projectilesound = 'sound/weapons/gunshot.ogg' @@ -61,8 +61,8 @@ icon_living = "EngBot" icon_dead = "EngBot" desc = "A strange engineering robot that does not seem pleased to meet you." - health = 60 - maxHealth = 60 + health = 75 + maxHealth = 75 /mob/living/simple_animal/hostile/hivebot/strong name = "elite hivebot" @@ -70,8 +70,8 @@ icon_living = "strong" icon_dead = "strong" desc = "A heavily armed and armored robot that does not seem pleased to meet you." - health = 95 - maxHealth = 95 + health = 100 + maxHealth = 100 ranged = 1 /mob/living/simple_animal/hostile/hivebot/death(gibbed)