Rebalances syndicate and pirate simple animals take two! (tgstation#3…

…9424)

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -33,7 +33,7 @@
 /area/template_noop)
 "ah" = (
 /obj/structure/lattice/catwalk,
-/mob/living/simple_animal/hostile/pirate/space/ranged{
+/mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
 /turf/template_noop,
@@ -176,7 +176,7 @@
 /area/shuttle/caravan/freighter3)
 "aP" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/mob/living/simple_animal/hostile/pirate/space/ranged{
+/mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
 /turf/open/floor/plasteel/airless/floorgrime,
@@ -1096,7 +1096,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/pirate/space/ranged{
+/mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
 /turf/open/floor/plasteel/airless/floorgrime,
@@ -1108,7 +1108,7 @@
 /area/shuttle/caravan/freighter2)
 "jO" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/pirate/space/ranged{
+/mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
 /turf/open/floor/plating/airless,

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/mob/simple_human.dmi'
 	icon_state = "piratemelee"
 	icon_living = "piratemelee"
-	icon_dead = "piratemelee_dead"
+	icon_dead = "pirate_dead"
 	mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
 	speak_chance = 0
 	turns_per_move = 5
@@ -14,67 +14,76 @@
 	speed = 0
 	maxHealth = 100
 	health = 100
-	spacewalk = TRUE
-
 	harm_intent_damage = 5
-	obj_damage = 60
-	melee_damage_lower = 30
-	melee_damage_upper = 30
-	attacktext = "slashes"
-	attack_sound = 'sound/weapons/bladeslice.ogg'
-
+	melee_damage_lower = 10
+	melee_damage_upper = 10
+	attacktext = "punches"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	a_intent = INTENT_HARM
 	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
 	unsuitable_atmos_damage = 15
 	speak_emote = list("yarrs")
 	loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
 			/obj/item/melee/transforming/energy/sword/pirate)
 	del_on_death = 1
 	faction = list("pirate")
+
+
+/mob/living/simple_animal/hostile/pirate/melee
+	name = "Pirate Swashbuckler"
+	icon_state = "piratemelee"
+	icon_living = "piratemelee"
+	icon_dead = "piratemelee_dead"
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	armour_penetration = 35
+	attacktext = "slashes"
+	attack_sound = 'sound/weapons/blade1.ogg'
 	var/obj/effect/light_emitter/red_energy_sword/sord
 
-/mob/living/simple_animal/hostile/pirate/Initialize()
+/mob/living/simple_animal/hostile/pirate/melee/space
+	name = "Space Pirate Swashbuckler"
+	icon_state = "piratespace"
+	icon_living = "piratespace"
+	icon_dead = "piratespace_dead"
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE
+
+/mob/living/simple_animal/hostile/pirate/melee/Initialize()
 	. = ..()
 	sord = new(src)
 
-/mob/living/simple_animal/hostile/pirate/Destroy()
+/mob/living/simple_animal/hostile/pirate/melee/Destroy()
 	QDEL_NULL(sord)
 	return ..()
 
+/mob/living/simple_animal/hostile/pirate/melee/Initialize()
+	. = ..()
+	set_light(2)
+
 /mob/living/simple_animal/hostile/pirate/ranged
 	name = "Pirate Gunner"
 	icon_state = "pirateranged"
 	icon_living = "pirateranged"
-	icon_dead = "piratemelee_dead"
+	icon_dead = "pirateranged_dead"
 	projectilesound = 'sound/weapons/laser.ogg'
 	ranged = 1
-	rapid = 3
+	rapid = 2
+	rapid_fire_delay = 6
 	retreat_distance = 5
 	minimum_distance = 5
 	projectiletype = /obj/item/projectile/beam/laser
 	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
 			/obj/item/gun/energy/laser)
 
-/mob/living/simple_animal/hostile/pirate/space
-	name = "Space Pirate"
-	icon_state = "piratespace"
-	icon_living = "piratespace"
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	speed = 1
-
-/mob/living/simple_animal/hostile/pirate/space/Initialize()
-	. = ..()
-	set_light(3)
-
-/mob/living/simple_animal/hostile/pirate/space/ranged
+/mob/living/simple_animal/hostile/pirate/ranged/space
 	name = "Space Pirate Gunner"
 	icon_state = "piratespaceranged"
 	icon_living = "piratespaceranged"
-	projectilesound = 'sound/weapons/laser.ogg'
-	ranged = 1
-	rapid = 3
-	retreat_distance = 5
-	minimum_distance = 5
-	projectiletype = /obj/item/projectile/beam/laser
-	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
-			/obj/item/gun/energy/laser)
+	icon_dead = "piratespaceranged_dead"
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+	spacewalk = TRUE

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -50,19 +50,18 @@
 ///////////////Sword and shield////////////
 
 /mob/living/simple_animal/hostile/syndicate/melee
-	melee_damage_lower = 25
+	melee_damage_lower = 30
 	melee_damage_upper = 30
 	icon_state = "syndicatemelee"
 	icon_living = "syndicatemelee"
 	loot = list(/obj/effect/gibspawner/human)
 	attacktext = "slashes"
-	attack_sound = 'sound/weapons/bladeslice.ogg'
-	armour_penetration = 28
+	attack_sound = 'sound/weapons/blade1.ogg'
+	armour_penetration = 35
 	light_color = LIGHT_COLOR_RED
 	status_flags = 0
-	maxHealth = 170
-	health = 170
-	spacewalk = TRUE
+	maxHealth = 100
+	health = 100
 
 /mob/living/simple_animal/hostile/syndicate/melee/Initialize()
 	. = ..()
@@ -84,9 +83,12 @@
 	icon_state = "syndicatemeleespace"
 	icon_living = "syndicatemeleespace"
 	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
 	loot = list(/obj/effect/gibspawner/human)
 	speed = 1
 	var/obj/effect/light_emitter/red_energy_sword/sord
+	spacewalk = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/space/Initialize()
 	. = ..()
@@ -101,15 +103,15 @@
 	icon_state = "syndicatemeleestormtrooper"
 	icon_living = "syndicatemeleestormtrooper"
 	name = "Syndicate Stormtrooper"
-	maxHealth = 340
-	health = 340
+	maxHealth = 250
+	health = 250
 	loot = list(/obj/effect/gibspawner/human)
 
 ///////////////Guns////////////
 
 /mob/living/simple_animal/hostile/syndicate/ranged
 	ranged = 1
-	rapid = 3
+	rapid = 2
 	retreat_distance = 5
 	minimum_distance = 5
 	icon_state = "syndicateranged"
@@ -119,7 +121,7 @@
 	loot = list(/obj/effect/gibspawner/human)
 
 /mob/living/simple_animal/hostile/syndicate/ranged/pilot //caravan ambush ruin
-	name = "Syndicate Salvage Pilot"	
+	name = "Syndicate Salvage Pilot"
 	loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
 
 /mob/living/simple_animal/hostile/syndicate/ranged/infiltrator //shuttle loan event
@@ -131,6 +133,8 @@
 	icon_state = "syndicaterangedspace"
 	icon_living = "syndicaterangedspace"
 	name = "Syndicate Commando"
+	maxHealth = 170
+	health = 170
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	speed = 1
@@ -145,9 +149,11 @@
 	icon_state = "syndicaterangedstormtrooper"
 	icon_living = "syndicaterangedstormtrooper"
 	name = "Syndicate Stormtrooper"
-	maxHealth = 200
-	health = 200
-	casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a three-round burst
+	maxHealth = 250
+	health = 250
+	rapid_fire_delay = 6
+	minimum_distance = 3
+	casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot (up to 72.5 brute) fired in a two-round burst
 	projectilesound = 'sound/weapons/gunshot.ogg'
 	loot = list(/obj/effect/gibspawner/human)