Fix Lobotomy Corp Achivement Icons [testmerge whenever] (#2554)

Fix Lobotomy Corp Achivement Icons

Fix achivements for lobotomy corp themed achivements and moves them into their own file.

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

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)

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"

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
 

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"

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?"

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

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 */
 

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
 

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

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()
 	..()

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()
 	..()

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"