diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index d8c949c5d76..750dbfdf3f7 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -153,13 +153,12 @@ Implant Specifics:
"} desc = "A military grade micro bio-explosive. Highly dangerous." var/elevel = "Localized Limb" var/phrase - var/fallback_phrase = "supercalifragilisticexpialidocious" var/setup_done = FALSE //Have we set this yet? icon_state = "implant_evil" /obj/item/implant/explosive/Initialize() . = ..() - fallback_phrase = pick(adjectives) + phrase = "You are [pick(adjectives)]" /obj/item/implant/explosive/get_data() . = {" @@ -179,12 +178,10 @@ Implant Specifics:
"} if(implanter.imp) to_chat(user, SPAN_NOTICE("\The [implanter] already has an implant loaded.")) return // It's full. - if(!phrase) - var/choice = alert("\The [src]'s default phrase has not been changed. Continue?", "Ready for Implantation?", "Yes", "Cancel") + if(!setup_done) + var/choice = alert("\The [src]'s default settings have not been changed. Continue?", "Ready for Implantation?", "Yes", "Cancel") if(choice == "Cancel") return - else - phrase = fallback_phrase to_chat(user, "You load \the [src] into \the [I]. The current setting is \"[elevel]\" and the current phrase is \"[phrase]\".") user.drop_from_inventory(src) forceMove(implanter) @@ -272,8 +269,6 @@ Implant Specifics:
"} SSexplosives.queue(data) /obj/item/implant/explosive/implanted(mob/source, mob/user) - if(!phrase) - phrase = fallback_phrase if(user.mind) user.mind.store_memory("\The [src] in [source] can be activated by saying something containing the phrase ''[phrase]'', say [phrase] to attempt to activate.", 0, 0) to_chat(usr, "\The [src] in [source] can be activated by saying something containing the phrase ''[phrase]'', say [phrase] to attempt to activate.") @@ -284,8 +279,6 @@ Implant Specifics:
"} phrase = input("Choose activation phrase:") as text var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "") phrase = replace_characters(phrase, replacechars) - if(!phrase) - phrase = fallback_phrase user.mind.store_memory("\The [src] can be activated by saying something containing the phrase ''[phrase]'', say [phrase] to attempt to activate.", 0, 0) to_chat(user, "\The [src] can be activated by saying something containing the phrase ''[phrase]'', say [phrase] to attempt to activate.") setup_done = TRUE diff --git a/html/changelogs/doxxmedearly - bombedthatcode.yml b/html/changelogs/doxxmedearly - bombedthatcode.yml new file mode 100644 index 00000000000..0ea8ee6ef03 --- /dev/null +++ b/html/changelogs/doxxmedearly - bombedthatcode.yml @@ -0,0 +1,8 @@ +# Your name. +author: Doxxmedearly + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - bugfix: "New/unset explosive implants are no longer triggered by literally any word. The default phrase is also harder to just randomly say."