From aa26e9fc69874ed49ac5aaec448595b4e06bbdcb Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 15 Aug 2024 05:50:33 +0200 Subject: [PATCH] Crabs and lobstrosities now pack a boatload of puns. (#85440) ## About The Pull Request Whale whale whale, It wasn't shrimple, I had to spend severals minutes swimming around to find sea-related punss to use for this PR. I'm otterly and clampletely exhausted. Soooo, exactly what it reads on the title, however it also applies to the lobster foam helmet, which is contraband from the Autrodrobe. ## Why It's Good For The Game I thought it'd been interesting to shove a bunch of puns into crustacean mobs. To make them a little bit more unique, and see how many puns I could find or come up with. ## Changelog :cl: add: Crabs and lobstrosities (as well as the lobster foam helmet and the fishing hat) now pack a boatload of fish puns. /:cl: --- code/modules/clothing/head/costume.dm | 4 + code/modules/clothing/head/soft_caps.dm | 1 + code/modules/events/ghost_role/sentience.dm | 2 + .../basic/lavaland/lobstrosity/lobstrosity.dm | 1 + code/modules/mob/living/basic/vermin/crab.dm | 1 + strings/crustacean_replacement.json | 160 ++++++++++++++++++ 6 files changed, 169 insertions(+) create mode 100644 strings/crustacean_replacement.json diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index 13a6e549b0e..5442210aecd 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -87,6 +87,10 @@ clothing_flags = SNUG_FIT flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT +/obj/item/clothing/head/costume/lobsterhat/Initialize(mapload) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) + /obj/item/clothing/head/costume/drfreezehat name = "doctor freeze's wig" desc = "A cool wig for cool people." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index cb0f9033960..4744296cdb8 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -173,6 +173,7 @@ /obj/item/clothing/head/soft/fishing_hat/Initialize(mapload) . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) //you asked for this. AddElement(/datum/element/skill_reward, /datum/skill/fishing) #define PROPHAT_MOOD "prophat" diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 4017361dba5..09281300845 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -3,6 +3,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/basic/butterfly, /mob/living/basic/carp/pet/cayenne, /mob/living/basic/chicken, + /mob/living/basic/crab, /mob/living/basic/cow, /mob/living/basic/goat, /mob/living/basic/lizard, @@ -18,6 +19,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/simple_animal/bot/secbot/beepsky, /mob/living/simple_animal/hostile/retaliate/goose/vomit, /mob/living/basic/bear/snow/misha, + /mob/living/basic/mining/lobstrosity/juvenile, ))) /datum/round_event_control/sentience diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm index 7dcbc4ae325..8c879d3ab48 100644 --- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm +++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm @@ -45,6 +45,7 @@ AddElement(/datum/element/mob_grabber) AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW) AddElement(/datum/element/basic_eating, food_types = target_foods) + AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) AddComponent(\ /datum/component/amputating_limbs,\ surgery_time = snip_speed, \ diff --git a/code/modules/mob/living/basic/vermin/crab.dm b/code/modules/mob/living/basic/vermin/crab.dm index 18a935443a1..0183be667b8 100644 --- a/code/modules/mob/living/basic/vermin/crab.dm +++ b/code/modules/mob/living/basic/vermin/crab.dm @@ -34,6 +34,7 @@ AddElement(/datum/element/tiny_mob_hunter, MOB_SIZE_TINY) AddElement(/datum/element/ai_retaliate) AddElement(/datum/element/ai_flee_while_injured) + AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) //COFFEE! SQUEEEEEEEEE! /mob/living/basic/crab/coffee diff --git a/strings/crustacean_replacement.json b/strings/crustacean_replacement.json new file mode 100644 index 00000000000..9c1ebabcbc0 --- /dev/null +++ b/strings/crustacean_replacement.json @@ -0,0 +1,160 @@ +{ + + "crustacean": { + "simp": "shrimp", + "problem": "prawnblem", + "proba": "prawnba", + "prob": "prawn", + "pawn": "prawn", + "cool": "tenta-cool", + "bat": "bait", + "fuck": "shuck", + "brilliant": "gilliant", + "totally": "turtally", + "confu" : "conchfu", + "kungfu": "conchfu", + "kung fu": "conch fu", + " mull": " mullet", + "believe": "bereef", + "believ": "bereef", + "rage": "rayge", + "kid": "squid", + "mark": "shark", + "tray": "cray", + "cry": "cray", + "pray": "cray", + "comp": "clam", + "calm": "clam", + "calam": "clam", + "ambulance": "clambulance", + "bike": "pike", + "suspicious": "fishy", + " sus ": " fishy ", + "sussy": "sushi", + "tune": "tuna", + "opportunity": "opportunaty", + "got ": "cod ", + "god": "cod", + "caught": "cod", + "grapple": "crapple", + "grabb": "crappl", + " rue": " roe", + "grab": "crapple", + "self": "shellf", + "cell": "shell", + "come": "chum", + "plank ": "plankton ", + "meant": "manta", + "skill": "krill", + "chill": "krill", + "core": "coral", + "hell of it": "halibut", + "hell": "eel", + "whole": "whale", + "muscle": "mussel", + "cracking" : "kraken", + "crackin": "kraken", + "opinion": "octopinion", + "utter": "otter", + "neme": "nemo", + "real": "reel", + "orc ": "orca ", + "ork ": "orca ", + "macaroni": "mackarel", + "usurer": "loan shark", + "chewy": "spongey", + "hamburger": "crabby patty", + "burger": "patty", + "crust": "krust", + "offic": "ofish", + "outer space": "trouter space", + "deepspace": "trouter space", + "deep space": "trouter space", + "surgeon": "sturgeon", + "purpose": "porpoise", + "bastard": "basstard", + "ballock": "pollock", + "fist": "fish", + "place": "plaice", + "definitively" : "dolphinitely", + "enemy": "anemony", + "enemies": "anemones", + " mob": " lob", + "bitch": "beach", + " min ": "minnow", + "lemme know": "lemminnow", + "let me know": "let minnow", + "admin": "adminnow", + "better": "betta", + " ass ": " wrasse ", + "asshole" : "wrassehole", + "bond" : "pond", + "inc": "ink", + "anything": "anyfin", + "something": "somefin", + "anythin": "anyfin", + "somethin": "somefin", + "someone": "salmon", + "coy": "koi", + "earring": "herring", + "hearin": "herrin", + "celebrat": "shellebrat", + "santa": "sandy", + "claus": "claws", + "boss": "bass", + "doofus": "doofish", + "could": "cod", + "what are": "water", + "what're": "water", + "whatre": "wa'er", + "other": "otter", + "lots": "lobst", + "fumble": "flounder", + "serious": "searious", + "show": "shoal", + "miracle": "mackerel", + "trait": "trout", + "syndicate": "sea world", + "syndies": "fishermen", + "syndie": "fisherman", + "syndi": "fisherman", + "spy": "marine biologist", + "above": "upstream", + "below": "downstream", + "heretic": "herringtic", + "cult": "shoalt", + "nar'si": "carp'si", + "narsi": "carpsi", + "blob": "blobfish", + "dumbass": "dum bass", + "outdone": "troutdone", + "quintessen": "squiddessen", + "clos": "claws", + "absol": "crabsol", + "crap": [ + "carp", + "crab" + ], + "kill": [ + "krill", + "gill" + ], + "fanta": [ + "manta", + "finta" + ], + "billion": [ + "bill-ion", + "krillion" + ], + "click": [ + "click", + "clack" + ], + "snap": [ + "snip", + "snap" + ] + } + +}