From 528259e123b0f6dfe431d64c99d05c10b7974a3f Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Mon, 18 Jul 2016 17:32:20 -0700 Subject: [PATCH] defines and fixes. --- code/modules/admin/verbs/debug.dm | 4 ++-- .../living/simple_animal/hostile/megafauna/bubblegum.dm | 5 ++++- .../living/simple_animal/hostile/megafauna/colossus.dm | 6 +++++- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 4 +++- .../mob/living/simple_animal/hostile/megafauna/legion.dm | 5 ++++- .../living/simple_animal/hostile/megafauna/megafauna.dm | 9 +++++++-- .../mob/living/simple_animal/hostile/mining_mobs.dm | 7 +++++-- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b6cb13f70e1..f2ee15cd98e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -788,6 +788,6 @@ var/global/list/g_fancy_list_of_types = null global.medals_enabled = !global.medals_enabled - message_admins("[key_name_admin(src)] [global.medals_enabled ? "enabled" : "disabled"] the medal hub lockout.") + message_admins("[key_name_admin(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") feedback_add_details("admin_verb","TMH") // If... - log_admin("[key_name(src)] [global.medals_enabled ? "enabled" : "disabled"] the medal hub lockout.") \ No newline at end of file + log_admin("[key_name(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index b4e53beba0f..db3fb4e07bb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -1,3 +1,5 @@ +#define MEDAL_PREFIX "Bubblegum" + /* BUBBLEGUM @@ -50,7 +52,7 @@ Difficulty: Hard idle_vision_range = 5 loot = list(/obj/structure/closet/crate/necropolis/bubblegum) var/charging = 0 - medal_type = "Bubblegum" + medal_type = MEDAL_PREFIX score_type = BUBBLEGUM_SCORE deathmessage = "sinks into a pool of blood, fleeing the battle. You've won, for now... " death_sound = 'sound/magic/enter_blood.ogg' @@ -192,3 +194,4 @@ Difficulty: Hard faction = list("mining") weather_immunities = list("lava","ash") +#undef MEDAL_PREFIX \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 9806176c128..17a10a1789e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -1,3 +1,5 @@ + +#define MEDAL_PREFIX "Colossus" /* COLOSSUS @@ -49,7 +51,7 @@ Difficulty: Very Hard aggro_vision_range = 18 idle_vision_range = 5 del_on_death = 1 - medal_type = "Colossus" + medal_type = MEDAL_PREFIX score_type = COLOSSUS_SCORE loot = list(/obj/machinery/smartfridge/black_box) butcher_results = list(/obj/item/weapon/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/animalhide/ashdrake = 10, /obj/item/stack/sheet/bone = 30) @@ -346,3 +348,5 @@ Difficulty: Very Hard /obj/machinery/smartfridge/black_box/default_deconstruction_crowbar() return + +#undef MEDAL_PREFIX \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 32cf71e0aeb..a8b8f8ad6ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -1,3 +1,4 @@ +#define MEDAL_PREFIX "Drake" /* ASH DRAKE @@ -56,7 +57,7 @@ Difficulty: Medium var/obj/item/device/gps/internal var/swooping = 0 var/swoop_cooldown = 0 - medal_type = "Drake" + medal_type = MEDAL_PREFIX score_type = DRAKE_SCORE deathmessage = "collapses into a pile of bones, its flesh sloughing away." death_sound = 'sound/magic/demon_dies.ogg' @@ -263,3 +264,4 @@ Difficulty: Medium damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) loot = list() +#undef MEDAL_PREFIX \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 1b51dff2d45..deb249dafcb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -1,3 +1,4 @@ +#define MEDAL_PREFIX "Legion" /* LEGION @@ -40,7 +41,7 @@ Difficulty: Medium ranged_cooldown_time = 20 var/size = 10 var/charging = 0 - medal_type = "Legion" + medal_type = MEDAL_PREFIX score_type = LEGION_SCORE pixel_y = -90 pixel_x = -75 @@ -175,3 +176,5 @@ Difficulty: Medium A.telegraph() storm_cooldown = world.time + 600 + +#undef MEDAL_PREFIX \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 85ca2444788..59509dfa5b4 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -1,3 +1,6 @@ +#define MEDAL_PREFIX "Boss" + + /mob/living/simple_animal/hostile/megafauna name = "boss of this gym" desc = "Attack the weak point for massive damage." @@ -12,7 +15,7 @@ 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 maxbodytemp = INFINITY - var/medal_type = "Boss" + var/medal_type = MEDAL_PREFIX var/score_type = BOSS_SCORE var/elimination = 0 anchored = TRUE @@ -179,4 +182,6 @@ else if (result) message_admins("Medal: [medal] removed for [player.ckey]") else - message_admins("Medal: [medal] was not found for [player.ckey]. Unable to clear.") \ No newline at end of file + message_admins("Medal: [medal] was not found for [player.ckey]. Unable to clear.") + +#undef MEDAL_PREFIX \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index d00f8d7d564..d75ad784cb5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -1011,6 +1011,7 @@ qdel(gps) . = ..() +#define MEDAL_PREFIX "Tendril" /mob/living/simple_animal/hostile/spawner/lavaland/death() var/last_tendril = TRUE for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in mob_list) @@ -1024,9 +1025,11 @@ if(L.client) var/client/C = L.client var/suffixm = ALL_KILL_MEDAL - UnlockMedal("Tendril [suffixm]",C) + var/prefix = MEDAL_PREFIX + UnlockMedal("[prefix] [suffixm]",C) SetScore(TENDRIL_CLEAR_SCORE,C,1) - + ..() +#undef MEDAL_PREFIX /obj/effect/collapse name = "collapsing necropolis tendril"