From f844c39ab1af482147152eb99f2fb95d58fea125 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 2 Sep 2020 03:01:02 +0200 Subject: [PATCH] [MIRROR] Add a new achievement (#600) * Add a new achievement (#53282) This achievement can be gained by slapping bubblegum with a tongue. For science! Sprite by Arcane * Add a new achievement Co-authored-by: oranges --- code/__DEFINES/achievements.dm | 1 + code/datums/achievements/misc_achievements.dm | 6 ++++++ code/modules/asset_cache/asset_list_items.dm | 3 ++- .../simple_animal/hostile/megafauna/bubblegum.dm | 15 +++++++++++++++ .../Achievements/Misc/frenchingthebubble.png | Bin 0 -> 4864 bytes 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 icons/UI_Icons/Achievements/Misc/frenchingthebubble.png 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 0000000000000000000000000000000000000000..d94c3e9cc45d8b1db8016ed7ce8469dd2e7233c2 GIT binary patch literal 4864 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 m7@oPN2H#%LNnE9)mH!`IG2o`eKEM(H0000