diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index 05caeea2b977..0068c3cfeb23 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -31,7 +31,6 @@ #define MEDAL_RUST_ASCENSION "Rust" #define MEDAL_VOID_ASCENSION "Void" #define MEDAL_TOOLBOX_SOUL "Toolsoul" -//#define MEDAL_CHEM_TUT "Beginner Chemist" #define MEDAL_HOT_DAMN "Hot Damn!" //LC13 Achievements diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index c2a25b3a5f23..87b34d6c8732 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -190,7 +190,7 @@ if(human_mob.mind) var/datum/mind/M = human_mob.mind if(M.get_skill_level(/datum/skill/fishing) >= 6) - player_client.give_award(/datum/award/achievement/misc/scorpworld, human_mob) + player_client.give_award(/datum/award/achievement/lc13/scorpworld, human_mob) //If you join not from roundstart you do not apply for these achivements. if(M.late_joiner) return FALSE @@ -208,9 +208,9 @@ "Training Officer", ) if(M.assigned_role in valid_roles) - player_client.give_award(/datum/award/achievement/misc/lcorpworld, human_mob) + player_client.give_award(/datum/award/achievement/lc13/lcorpworld, human_mob) if(istype(human_mob.ego_gift_list["Right Back Slot"], /datum/ego_gifts/twilight)) - player_client.give_award(/datum/award/achievement/misc/twilight, human_mob) + player_client.give_award(/datum/award/achievement/lc13/twilight, human_mob) ///Handles random hardcore point rewarding if it applies. /datum/controller/subsystem/ticker/proc/HandleRandomHardcoreScore(client/player_client) diff --git a/code/datums/achievements/LC13_achievements.dm b/code/datums/achievements/LC13_achievements.dm new file mode 100644 index 000000000000..16b5e56914a8 --- /dev/null +++ b/code/datums/achievements/LC13_achievements.dm @@ -0,0 +1,68 @@ + +//LC13 achivements +/datum/award/achievement/lc13 + category = "LobotomyCorp" + +/* +* Possible Achivements +/datum/award/achievement/lc13/dayfifty + name = "Tree of Light" + desc = "You witnessed the fruits of your labor." + database_id = MEDAL_DAYFIFTY + icon = "dayfifty" + +/datum/award/achievement/lc13/fullgifts + name = "Part of Many" + desc = "Have a Ego Gift in every slot, wings and special do not count." + database_id = MEDAL_FULLGIFTS + icon = "fullgifts" +*/ +/datum/award/achievement/lc13/lcorpworld + name = "Job Well Done" + desc = "One of your characters survived a full shift as a L corp employee." + database_id = MEDAL_LCORPWORLD + icon = "lcorp" + +/datum/award/achievement/lc13/scorpworld + name = "A Shrimple Arrangement" + desc = "One of your characters lived to be recruited by S corp." + database_id = MEDAL_SCORPWORLD + icon = "shrimp" + +//You cant really be in the room when apocabird dies so it might be better to check for this. +/datum/award/achievement/lc13/twilight + name = "Step into the Black Forest" + desc = "End the shift forever marked by the the monster of the Black Forest." + database_id = MEDAL_TWILIGHT + icon = "twilight" + +//LC13 Bosses +/datum/award/achievement/lc13/white_night + name = "Atonement" + desc = "Slay T-03-46 and prevent divine judgement." + database_id = BOSS_MEDAL_WHITENIGHT + icon = "whitenight" + +/datum/award/achievement/lc13/ambermidnight + name = "Eternal Meal" + desc = "Defend the facility from an insatiable swarm." + database_id = BOSS_MEDAL_AMBERMIDNIGHT + icon = "amber" + +/datum/award/achievement/lc13/greenmidnight + name = "Last Helix" + desc = "Save the facility from being cleansed." + database_id = BOSS_MEDAL_GREENMIDNIGHT + icon = "green" + +/datum/award/achievement/lc13/violetmidnight + name = "The God Delusion" + desc = "Defend the facility from an enigmatic force." + database_id = BOSS_MEDAL_VIOLETMIDNIGHT + icon = "violet" + +/datum/award/achievement/lc13/whitemidnight + name = "The Claw" + desc = "Relive the worst day of the founders life." + database_id = BOSS_MEDAL_WHITEMIDNIGHT + icon = "claw" diff --git a/code/datums/achievements/_achievement_data.dm b/code/datums/achievements/_achievement_data.dm index 80f544a965c3..d7943921f047 100644 --- a/code/datums/achievements/_achievement_data.dm +++ b/code/datums/achievements/_achievement_data.dm @@ -109,7 +109,7 @@ /datum/achievement_data/ui_data(mob/user) var/ret_data = list() // screw standards (qustinnus you must rename src.data ok) - ret_data["categories"] = list("Bosses", "Misc", "Mafia", "Scores") + ret_data["categories"] = list("Bosses", "Misc", "Mafia", "LobotomyCorp", "Scores") ret_data["achievements"] = list() ret_data["user_key"] = user.ckey diff --git a/code/datums/achievements/boss_achievements.dm b/code/datums/achievements/boss_achievements.dm index 08d3158acf09..5d75979d834d 100644 --- a/code/datums/achievements/boss_achievements.dm +++ b/code/datums/achievements/boss_achievements.dm @@ -115,34 +115,3 @@ name = "Wendigo Crusher" desc = "You've now ruined years of mythical storytelling." database_id = BOSS_MEDAL_WENDIGO_CRUSHER - -//LC13 Bosses -/datum/award/achievement/boss/white_night - name = "Atonement" - desc = "Slay T-03-46 and prevent divine judgement." - database_id = BOSS_MEDAL_WHITENIGHT - icon = "whitenight" - -/datum/award/achievement/boss/ambermidnight - name = "Eternal Meal" - desc = "Defend the facility from an insatiable swarm." - database_id = BOSS_MEDAL_AMBERMIDNIGHT - icon = "amber" - -/datum/award/achievement/boss/greenmidnight - name = "Last Helix" - desc = "Save the facility from being cleansed." - database_id = BOSS_MEDAL_GREENMIDNIGHT - icon = "green" - -/datum/award/achievement/boss/violetmidnight - name = "The God Delusion" - desc = "Defend the facility from an enigmatic force." - database_id = BOSS_MEDAL_VIOLETMIDNIGHT - icon = "violet" - -/datum/award/achievement/boss/whitemidnight - name = "The Claw" - desc = "Relive the worst day of the founders life." - database_id = BOSS_MEDAL_WHITEMIDNIGHT - icon = "claw" diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm index 67a200e44c93..a3a78a9444c2 100644 --- a/code/datums/achievements/misc_achievements.dm +++ b/code/datums/achievements/misc_achievements.dm @@ -20,42 +20,6 @@ database_id = MEDAL_TIMEWASTE icon = "timewaste" -//LC13 achivements -/* -* Possible Achivements -/datum/award/achievement/misc/dayfifty - name = "Tree of Light" - desc = "You witnessed the fruits of your labor." - database_id = MEDAL_DAYFIFTY - icon = "dayfifty" - -/datum/award/achievement/misc/fullgifts - name = "Part of Many" - desc = "Have a Ego Gift in every slot, wings and special do not count." - database_id = MEDAL_FULLGIFTS - icon = "fullgifts" -*/ -/datum/award/achievement/misc/lcorpworld - name = "Job Well Done" - desc = "One of your characters survived a full shift as a L corp employee." - database_id = MEDAL_LCORPWORLD - icon = "lcorp" - -/datum/award/achievement/misc/scorpworld - name = "A Shrimple Arrangement" - desc = "One of your characters lived to be recruited by S corp." - database_id = MEDAL_SCORPWORLD - icon = "shrimp" - -//You cant really be in the room when apocabird dies so it might be better to check for this. -/datum/award/achievement/misc/twilight - name = "Step into the Black Forest" - desc = "End the shift forever marked by the the monster of the Black Forest." - database_id = MEDAL_TWILIGHT - icon = "twilight" - -//////////////////// - /datum/award/achievement/misc/feat_of_strength name = "Feat of Strength" desc = "If the rod is immovable, is it passing you or are you passing it?" diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 1935c417292e..97f853d4bd8d 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -268,7 +268,15 @@ "thoughtfeeder" = 'icons/UI_Icons/Achievements/Mafia/thoughtfeeder.png', "traitor" = 'icons/UI_Icons/Achievements/Mafia/traitor.png', "basemafia" ='icons/UI_Icons/Achievements/basemafia.png', - "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png' + "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png', + "amber" = 'icons/UI_Icons/Achievements/lobotomycorp13/amber.png', + "claw" = 'icons/UI_Icons/Achievements/lobotomycorp13/claw.png', + "green" = 'icons/UI_Icons/Achievements/lobotomycorp13/green.png', + "lcorp" = 'icons/UI_Icons/Achievements/lobotomycorp13/lcorp.png', + "shrimp" = 'icons/UI_Icons/Achievements/lobotomycorp13/shrimp.png', + "twilight" = 'icons/UI_Icons/Achievements/lobotomycorp13/twlight.png', + "violet" = 'icons/UI_Icons/Achievements/lobotomycorp13/violet.png', + "whitenight" = 'icons/UI_Icons/Achievements/lobotomycorp13/whitenight.png', ) /datum/asset/spritesheet/simple/pills diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm index e081c782804a..0cbd36d1f7d0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm @@ -244,7 +244,7 @@ GLOBAL_LIST_EMPTY(apostles) for(var/mob/living/L in view(7,src)) if(L.stat || !L.client) continue - L.client.give_award(/datum/award/achievement/boss/white_night, L) + L.client.give_award(/datum/award/achievement/lc13/white_night, L) /* Apostles */ diff --git a/code/modules/ordeals/amber_ordeals.dm b/code/modules/ordeals/amber_ordeals.dm index 4d69820ae355..2587fdcf22e7 100644 --- a/code/modules/ordeals/amber_ordeals.dm +++ b/code/modules/ordeals/amber_ordeals.dm @@ -44,7 +44,7 @@ announce_sound = 'sound/effects/ordeals/amber_start.ogg' end_sound = 'sound/effects/ordeals/amber_end.ogg' color = "#FFBF00" - ordeal_achievement = /datum/award/achievement/boss/ambermidnight + ordeal_achievement = /datum/award/achievement/lc13/ambermidnight /// How many mobs to spawn var/spawn_amount = 1 diff --git a/code/modules/ordeals/green_ordeals.dm b/code/modules/ordeals/green_ordeals.dm index b2bbb312af58..d472569eba48 100644 --- a/code/modules/ordeals/green_ordeals.dm +++ b/code/modules/ordeals/green_ordeals.dm @@ -67,4 +67,4 @@ color = COLOR_DARK_LIME bosstype = /mob/living/simple_animal/hostile/ordeal/green_midnight bossspawnloc = /area/department_main/command - ordeal_achievement = /datum/award/achievement/boss/greenmidnight + ordeal_achievement = /datum/award/achievement/lc13/greenmidnight diff --git a/code/modules/ordeals/violet_ordeals.dm b/code/modules/ordeals/violet_ordeals.dm index 075de73c1318..d78558a08730 100644 --- a/code/modules/ordeals/violet_ordeals.dm +++ b/code/modules/ordeals/violet_ordeals.dm @@ -51,7 +51,7 @@ level = 4 reward_percent = 0.25 color = "#B642F5" - ordeal_achievement = /datum/award/achievement/boss/violetmidnight + ordeal_achievement = /datum/award/achievement/lc13/violetmidnight /datum/ordeal/violet_midnight/Run() ..() diff --git a/code/modules/ordeals/white_ordeals.dm b/code/modules/ordeals/white_ordeals.dm index 52cfa821e836..76e29082ea5c 100644 --- a/code/modules/ordeals/white_ordeals.dm +++ b/code/modules/ordeals/white_ordeals.dm @@ -93,7 +93,7 @@ reward_percent = 0.25 announce_sound = 'sound/effects/ordeals/white_start.ogg' end_sound = 'sound/effects/ordeals/white_end.ogg' - ordeal_achievement = /datum/award/achievement/boss/whitemidnight + ordeal_achievement = /datum/award/achievement/lc13/whitemidnight /datum/ordeal/white_midnight/Run() ..() diff --git a/icons/UI_Icons/Achievements/Boss/amber.png b/icons/UI_Icons/Achievements/lobotomycorp13/amber.png similarity index 100% rename from icons/UI_Icons/Achievements/Boss/amber.png rename to icons/UI_Icons/Achievements/lobotomycorp13/amber.png diff --git a/icons/UI_Icons/Achievements/Boss/claw.png b/icons/UI_Icons/Achievements/lobotomycorp13/claw.png similarity index 100% rename from icons/UI_Icons/Achievements/Boss/claw.png rename to icons/UI_Icons/Achievements/lobotomycorp13/claw.png diff --git a/icons/UI_Icons/Achievements/Boss/green.png b/icons/UI_Icons/Achievements/lobotomycorp13/green.png similarity index 100% rename from icons/UI_Icons/Achievements/Boss/green.png rename to icons/UI_Icons/Achievements/lobotomycorp13/green.png diff --git a/icons/UI_Icons/Achievements/Misc/lcorp.png b/icons/UI_Icons/Achievements/lobotomycorp13/lcorp.png similarity index 100% rename from icons/UI_Icons/Achievements/Misc/lcorp.png rename to icons/UI_Icons/Achievements/lobotomycorp13/lcorp.png diff --git a/icons/UI_Icons/Achievements/Misc/shrimp.png b/icons/UI_Icons/Achievements/lobotomycorp13/shrimp.png similarity index 100% rename from icons/UI_Icons/Achievements/Misc/shrimp.png rename to icons/UI_Icons/Achievements/lobotomycorp13/shrimp.png diff --git a/icons/UI_Icons/Achievements/Misc/twlight.png b/icons/UI_Icons/Achievements/lobotomycorp13/twlight.png similarity index 100% rename from icons/UI_Icons/Achievements/Misc/twlight.png rename to icons/UI_Icons/Achievements/lobotomycorp13/twlight.png diff --git a/icons/UI_Icons/Achievements/Boss/violet.png b/icons/UI_Icons/Achievements/lobotomycorp13/violet.png similarity index 100% rename from icons/UI_Icons/Achievements/Boss/violet.png rename to icons/UI_Icons/Achievements/lobotomycorp13/violet.png diff --git a/icons/UI_Icons/Achievements/Boss/whitenight.png b/icons/UI_Icons/Achievements/lobotomycorp13/whitenight.png similarity index 100% rename from icons/UI_Icons/Achievements/Boss/whitenight.png rename to icons/UI_Icons/Achievements/lobotomycorp13/whitenight.png diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index da5bca12f1b2..a7eb33437f05 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -444,6 +444,7 @@ #include "code\datums\achievements\_awards.dm" #include "code\datums\achievements\boss_achievements.dm" #include "code\datums\achievements\boss_scores.dm" +#include "code\datums\achievements\LC13_achievements.dm" #include "code\datums\achievements\mafia_achievements.dm" #include "code\datums\achievements\misc_achievements.dm" #include "code\datums\achievements\misc_scores.dm"