From fb7db36350797ec37d92e155560aa55bde1f4ebb Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Tue, 3 Sep 2019 03:34:15 -0400 Subject: [PATCH] fixed rapid mobs --- code/game/gamemodes/miniantags/guardian/types/ranged.dm | 3 +-- code/modules/mob/living/carbon/human/species/_species.dm | 2 -- code/modules/mob/living/carbon/human/species/shadow.dm | 4 ++-- code/modules/mob/living/simple_animal/hostile/hivebot.dm | 2 +- code/modules/mob/living/simple_animal/hostile/pirate.dm | 2 +- .../mob/living/simple_animal/hostile/retaliate/drone.dm | 2 +- code/modules/mob/living/simple_animal/hostile/syndicate.dm | 2 +- .../living/simple_animal/hostile/terror_spiders/empress.dm | 2 +- code/modules/mob/living/simple_animal/hostile/winter_mobs.dm | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/types/ranged.dm b/code/game/gamemodes/miniantags/guardian/types/ranged.dm index fe8a566ad52..871d7be1183 100644 --- a/code/game/gamemodes/miniantags/guardian/types/ranged.dm +++ b/code/game/gamemodes/miniantags/guardian/types/ranged.dm @@ -11,10 +11,9 @@ melee_damage_upper = 10 damage_transfer = 0.9 projectiletype = /obj/item/projectile/guardian - ranged_cooldown_time = 10 + ranged_cooldown_time = 1 //fast! projectilesound = 'sound/effects/hit_on_shattered_glass.ogg' ranged = 1 - rapid = 1 range = 13 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE see_in_dark = 8 diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 3e295eb9b4c..33df376ff51 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -64,8 +64,6 @@ var/ventcrawler = 0 //Determines if the mob can go through the vents. var/has_fine_manipulation = 1 // Can use small items. - var/mob/living/list/ignored_by = list() // list of mobs that will ignore this species - var/list/allowed_consumed_mobs = list() //If a species can consume mobs, put the type of mobs it can consume here. var/list/species_traits = list() diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm index fb7fd2ebda1..b662e5152f9 100644 --- a/code/modules/mob/living/carbon/human/species/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/shadow.dm @@ -8,8 +8,6 @@ unarmed_type = /datum/unarmed_attack/claws - ignored_by = list(/mob/living/simple_animal/hostile/faithless) - blood_color = "#CCCCCC" flesh_color = "#AAAAAA" has_organ = list( @@ -51,12 +49,14 @@ if(grant_vision_toggle) vision_toggle = new vision_toggle.Grant(H) + C.faction |= "faithless" /datum/species/shadow/on_species_loss(mob/living/carbon/human/H) ..() if(grant_vision_toggle && vision_toggle) H.vision_type = null vision_toggle.Remove(H) + C.faction -= "faithless" /datum/species/shadow/handle_life(mob/living/carbon/human/H) var/light_amount = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 9695cacccd8..30572f19158 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -36,7 +36,7 @@ /mob/living/simple_animal/hostile/hivebot/rapid ranged = 1 - rapid = 1 + rapid = 3 retreat_distance = 5 minimum_distance = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index 108daa031df..34a224ca5ce 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -36,7 +36,7 @@ icon_dead = "piratemelee_dead" projectilesound = 'sound/weapons/laser.ogg' ranged = 1 - rapid = 1 + rapid = 2 retreat_distance = 5 minimum_distance = 5 projectiletype = /obj/item/projectile/beam diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index 709a238346a..bd3314d1453 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -7,7 +7,7 @@ icon_living = "drone3" icon_dead = "drone_dead" ranged = 1 - rapid = 1 + rapid = 3 speak_chance = 5 turns_per_move = 3 response_help = "pokes the" diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index d95c18dd831..f380d85be34 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -257,7 +257,7 @@ /mob/living/simple_animal/hostile/syndicate/ranged ranged = 1 - rapid = 1 + rapid = 2 retreat_distance = 5 minimum_distance = 5 icon_state = "syndicateranged" diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm index 14353c4dfd0..90550dccdca 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm @@ -20,7 +20,7 @@ idle_ventcrawl_chance = 0 ai_playercontrol_allowtype = 0 ai_type = TS_AI_AGGRESSIVE - rapid = 1 + rapid = 3 canlay = 1000 spider_tier = TS_TIER_5 projectiletype = /obj/item/projectile/terrorqueenspit/empress diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index f96ebabf014..d8fba34296b 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -117,7 +117,7 @@ maxHealth = 250 health = 250 ranged = 1 - rapid = 1 + rapid = 3 speed = 0 //he's lost some weight from the fighting projectiletype = /obj/item/projectile/ornament retreat_distance = 3