From 9f2124dd3e3592e73d3aee65f77628c96f75c8bd Mon Sep 17 00:00:00 2001 From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> Date: Tue, 5 Feb 2019 20:16:47 +0100 Subject: [PATCH] fixes inconsistency in syndicate simple mobs (#42657) :cl: fix: some syndicate operatives simple mobs no longer have an invisible shield /:cl: they visually only have 1 knife, while their subtypes have a shield kevin put the var in the wrong place --- .../mob/living/simple_animal/hostile/syndicate.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 26bb9b0c13e..9d6ae2e8000 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -75,7 +75,7 @@ maxHealth = 250 health = 250 -/mob/living/simple_animal/hostile/syndicate/melee +/mob/living/simple_animal/hostile/syndicate/melee //dude with a knife and no shields melee_damage_lower = 15 melee_damage_upper = 15 icon_state = "syndicate_knife" @@ -84,7 +84,7 @@ attacktext = "slashes" attack_sound = 'sound/weapons/bladeslice.ogg' status_flags = 0 - var/projectile_deflect_chance = 50 + var/projectile_deflect_chance = 0 /mob/living/simple_animal/hostile/syndicate/melee/space icon_state = "syndicate_space_knife" @@ -96,6 +96,7 @@ minbodytemp = 0 speed = 1 spacewalk = TRUE + projectile_deflect_chance = 50 /mob/living/simple_animal/hostile/syndicate/melee/space/Initialize() . = ..() @@ -107,6 +108,7 @@ name = "Syndicate Stormtrooper" maxHealth = 250 health = 250 + projectile_deflect_chance = 50 /mob/living/simple_animal/hostile/syndicate/melee/sword melee_damage_lower = 30 @@ -119,6 +121,7 @@ light_color = LIGHT_COLOR_RED status_flags = 0 var/obj/effect/light_emitter/red_energy_sword/sord + projectile_deflect_chance = 50 /mob/living/simple_animal/hostile/syndicate/melee/sword/Initialize() . = ..() @@ -145,6 +148,7 @@ minbodytemp = 0 speed = 1 spacewalk = TRUE + projectile_deflect_chance = 50 /mob/living/simple_animal/hostile/syndicate/melee/sword/space/Initialize() . = ..() @@ -161,6 +165,7 @@ name = "Syndicate Stormtrooper" maxHealth = 250 health = 250 + projectile_deflect_chance = 50 ///////////////Guns////////////