From ce7f05334dac0fc81eca3fcb9b8f1e2e6c906f3b Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 1 Jan 2016 01:26:44 -0500 Subject: [PATCH] Bug fixes --- code/game/gamemodes/nations/nations.dm | 4 +-- code/game/mecha/mecha.dm | 5 ++++ .../living/simple_animal/bot_swarm/swarmer.dm | 25 ++++++++++++++++--- .../living/simple_animal/guardian/guardian.dm | 14 ++++++----- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 8bcd47c60b1..6d3190aa424 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -266,9 +266,9 @@ datum/game_mode/nations /datum/game_mode/proc/update_nations_icons_added(datum/mind/nations_mind,var/naticon) var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS] nations_hud.join_hud(nations_mind) - set_nations_hud(nations_mind.current,naticon) + set_nations_hud(nations_mind,naticon) /datum/game_mode/proc/update_nations_icons_removed(datum/mind/nations_mind) var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS] nations_hud.leave_hud(nations_mind) - set_nations_hud(nations_mind.current, null) \ No newline at end of file + set_nations_hud(nations_mind, null) \ No newline at end of file diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 938e9fcc9fd..276ed01252b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -498,6 +498,7 @@ /obj/mecha/proc/update_health() if(src.health > 0) src.spark_system.start() + diag_hud_set_mechhealth() else qdel(src) return @@ -921,6 +922,9 @@ src.take_damage(W.force,W.damtype) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) */ + diag_hud_set_mechhealth() + diag_hud_set_mechcell() + diag_hud_set_mechstat() return /obj/mecha/emag_act(user as mob) @@ -1831,6 +1835,7 @@ /obj/mecha/proc/dyngetcharge()//returns null if no powercell, else returns cell.charge if(!src.cell) return + diag_hud_set_mechcell() return max(0, src.cell.charge) /obj/mecha/proc/use_power(amount) diff --git a/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm b/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm index e04147a7c77..167a6e04a39 100644 --- a/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm +++ b/code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm @@ -69,7 +69,7 @@ pass_flags = PASSTABLE ventcrawler = 2 ranged = 1 - ranged_cooldown_cap = 2 + ranged_cooldown_cap = 1 universal_speak = 0 universal_understand = 0 projectilesound = 'sound/weapons/taser2.ogg' @@ -163,8 +163,27 @@ S.DisIntegrate(src) deactivate(S, 0) -/obj/machinery/particle_accelerator/control_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S.DisIntegrate(src) +/obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/fuel_chamber/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/particle_emitter/center/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/particle_emitter/left/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/particle_emitter/right/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/particle_emitter/end_cap/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + +/obj/structure/particle_accelerator/particle_emitter/power_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + S << "Disrupting the power grid would bring no benefit to us. Aborting." + /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisIntegrate(src) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index b202fd9bf81..c4df2390160 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -688,16 +688,18 @@ user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall user.verbs += /mob/living/proc/guardian_reset + var/magic_suite = pick("Wands","Cups","Swords","Pentacles") + var/picked_name = pick("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces") switch (theme) if("magic") - G.name = "[mob_name]" + G.name = "[mob_name] of [magic_suite]" G.color = picked_color - G.real_name = "[mob_name]" + G.real_name = "[mob_name] of [magic_suite]" user << "[G.magic_fluff_string]." if("tech") var/colour = pick("orange", "neon", "pink", "red", "blue", "green") - G.name = "[mob_name] [capitalize(colour)]" - G.real_name = "[mob_name] [capitalize(colour)]" + G.name = "[picked_name] [capitalize(colour)]" + G.real_name = "[picked_name] [capitalize(colour)]" G.icon_living = "parasite[colour]" G.icon_state = "parasite[colour]" G.icon_dead = "parasite[colour]" @@ -706,9 +708,9 @@ G.speak_emote = list("states") if("bio") user << "[G.bio_fluff_string]." - G.name = "[mob_name]" + G.name = "[mob_name] [picked_name]" G.color = picked_color - G.real_name = "[mob_name]" + G.real_name = "[mob_name] [picked_name]" G.icon_living = "headcrab" G.icon_state = "headcrab" G.attacktext = "swarms"