diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index 3aa277f0bb4..0499beb69a8 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -25,6 +25,7 @@ #define MEDAL_LOOKOUTSIR "Look Out, Sir!" #define MEDAL_GOTTEM "GOTTEM" #define MEDAL_ASCENSION "Ascension" +#define MEDAL_FRENCHING "FrenchingTheBubble" //Skill medal hub IDs #define MEDAL_LEGENDARY_MINER "Legendary Miner" diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm index 15570b35cb6..3957c52dc78 100644 --- a/code/datums/achievements/misc_achievements.dm +++ b/code/datums/achievements/misc_achievements.dm @@ -117,3 +117,9 @@ desc = "Caedite eos. Novit enim Dominus qui sunt eius." database_id = MEDAL_ASCENSION icon = "ascension" + +/datum/award/achievement/misc/frenching + name = "Frenching" + desc = "Just a taste, for science!" + database_id = MEDAL_FRENCHING + icon = "frenching" diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 11b93cfbfb7..dc1aeb10ed6 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -262,7 +262,8 @@ "psychologist" = 'icons/UI_Icons/Achievements/Mafia/psychologist.png', "thoughtfeeder" = 'icons/UI_Icons/Achievements/Mafia/thoughtfeeder.png', "traitor" = 'icons/UI_Icons/Achievements/Mafia/traitor.png', - "basemafia" ='icons/UI_Icons/Achievements/basemafia.png' + "basemafia" ='icons/UI_Icons/Achievements/basemafia.png', + "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png' ) /datum/asset/spritesheet/simple/pills 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 c6509fd990e..a58103d97ac 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -196,6 +196,21 @@ Difficulty: Hard if(bloodpool.len && (!faction_check_mob(L) || L.stat == DEAD)) . += L +/** + * Attack by override for bubblegum + * + * This is used to award the frenching achievement for hitting bubblegum with a tongue + * + * Arguments: + * * obj/item/W the item hitting bubblegum + * * mob/user The user of the item + * * params, extra parameters + */ +/mob/living/simple_animal/hostile/megafauna/bubblegum/attackby(obj/item/W, mob/user, params) + . = ..() + if(istype(W, /obj/item/organ/tongue)) + user.client?.give_award(/datum/award/achievement/misc/frenching, user) + /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack() var/list/targets = get_mobs_on_blood() if(targets.len) diff --git a/icons/UI_Icons/Achievements/Misc/frenchingthebubble.png b/icons/UI_Icons/Achievements/Misc/frenchingthebubble.png new file mode 100644 index 00000000000..d94c3e9cc45 Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/frenchingthebubble.png differ