diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm index f896a6d169e6..8e60ae70079d 100644 --- a/_maps/map_files220/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm @@ -119,17 +119,11 @@ }, /area/awaymission/space_battle/hallway6) "av" = ( -/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory{ - armour_penetration_flat = 20; - armour_penetration_percentage = 80; - loot = list(/obj/effect/decal/cleanable/ash,/obj/item/documents/syndicate/blue); - speed = 2; - health = 600; - maxHealth = 450; - name = "Syndicate Commander" +/obj/structure/chair/comfy/shuttle/dark{ + dir = 1 }, -/turf/simulated/floor/plasteel, -/area/awaymission/space_battle/bridge) +/turf/simulated/floor/mineral/plastitanium/red, +/area/awaymission/space_battle/syndicate/syndicate5) "aw" = ( /obj/structure/window/plasmareinforced{ color = "red"; @@ -1475,6 +1469,10 @@ }, /turf/simulated/floor/engine, /area/awaymission/space_battle/cruiser) +"eN" = ( +/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/awaymission/space_battle/syndicate/syndicate5) "eO" = ( /obj/machinery/door/airlock/titanium, /obj/effect/landmark/damageturf, @@ -4234,6 +4232,19 @@ icon_state = "blue" }, /area/awaymission/space_battle/bridge) +"nb" = ( +/obj/effect/decal/cleanable/blood, +/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory{ + armour_penetration_flat = 20; + armour_penetration_percentage = 80; + loot = list(/obj/effect/decal/cleanable/ash,/obj/item/documents/syndicate/blue); + speed = 2; + health = 600; + maxHealth = 450; + name = "Syndicate Commander" + }, +/turf/simulated/floor/plasteel, +/area/awaymission/space_battle/bridge) "nc" = ( /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plasteel{ @@ -9990,7 +10001,7 @@ /obj/structure/chair/comfy/shuttle/dark{ dir = 8 }, -/mob/living/simple_animal/hostile/syndicate/ranged/autogib/spacebattle, +/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate5) "Fd" = ( @@ -13765,6 +13776,10 @@ dir = 8 }, /area/awaymission/space_battle/hallway4) +"QF" = ( +/obj/structure/chair/comfy/shuttle/dark, +/turf/simulated/floor/mineral/plastitanium/red, +/area/awaymission/space_battle/syndicate/syndicate5) "QG" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral"; @@ -14591,10 +14606,7 @@ /area/awaymission/space_battle/syndicate/syndicate6) "Tq" = ( /obj/effect/spawner/window/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - layer = 2.9 - }, +/obj/machinery/door/poddoor, /turf/simulated/floor/plating, /area/awaymission/space_battle/syndicate/syndicate5) "Tr" = ( @@ -16007,7 +16019,7 @@ /area/awaymission/space_battle/cruiser) "XH" = ( /obj/mecha/combat/marauder/mauler{ - max_integrity = 400 + max_integrity = 250 }, /obj/machinery/light/directional/west, /turf/simulated/floor/mineral/plastitanium/red, @@ -50849,10 +50861,10 @@ jt by ek JE -by +nb JE -av JE +mb JE na VC @@ -67067,7 +67079,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -68847,7 +68859,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -69645,7 +69657,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -71658,7 +71670,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -73693,6 +73705,7 @@ yG yG yG yG +ol yG yG yG @@ -73756,8 +73769,7 @@ yG yG yG yG -yG -yG +ol yG yG yG @@ -75509,7 +75521,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -76041,13 +76053,13 @@ yG yG ps Nu -RU +QF ks ks dj ks ks -Jt +av Nu ps yG @@ -76555,13 +76567,13 @@ yG yG Nu Nu -ks +eN ks UJ XH IT ks -ks +eN Nu Nu yG @@ -77099,7 +77111,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -77298,7 +77310,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -77863,7 +77875,7 @@ yG yG yG yG -yG +ol yG yG yG @@ -80132,7 +80144,7 @@ yG yG yG yG -yG +ol yG yG yG diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index 86e62fad371b..e1fe6d8e7d1f 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -1386,8 +1386,8 @@ . = ..() /mob/living/simple_animal/hostile/syndicate/Initialize() - switch(rand(1,33)) - // 3% + switch(rand(1,100)) + // 1% if(1) SynSpace = /obj/item/clothing/suit/space/hardsuit/syndi else @@ -1428,9 +1428,11 @@ . = ..() /mob/living/simple_animal/hostile/syndicate/melee/autogib/spacebattle - damage_coeff = list("brute" = 0.8, "fire" = 0.8, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0.5) + damage_coeff = list("brute" = 1, "fire" = 0.6, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0.5) melee_damage_type = BURN attack_sound = 'sound/weapons/saberon.ogg' + maxHealth = 160 + health = 160 /mob/living/simple_animal/hostile/syndicate/melee/autogib/spacebattle/Initialize() . = ..() @@ -1438,11 +1440,11 @@ return . /mob/living/simple_animal/hostile/syndicate/melee/space/autogib/spacebattle - damage_coeff = list("brute" = 0.8, "fire" = 0.8, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0) + damage_coeff = list("brute" = 1, "fire" = 0.8, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0) melee_damage_type = BURN attack_sound = 'sound/weapons/saberon.ogg' - maxHealth = 130 - health = 130 + maxHealth = 200 + health = 200 /mob/living/simple_animal/hostile/syndicate/melee/space/autogib/spacebattle/Initialize() . = ..() @@ -1450,7 +1452,9 @@ return . /mob/living/simple_animal/hostile/syndicate/ranged/autogib/spacebattle - damage_coeff = list("brute" = 1, "fire" = 1, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0.5) + damage_coeff = list("brute" = 1, "fire" = 0.6, "tox" = 1, "clone" = 2, "stamina" = 0, "oxy" = 0.5) + maxHealth = 150 + health = 150 /mob/living/simple_animal/hostile/syndicate/ranged/autogib/spacebattle/Initialize() . = ..() @@ -1458,8 +1462,8 @@ return . /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle - maxHealth = 130 - health = 130 + maxHealth = 180 + health = 180 /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle/Initialize() . = ..()