Skip to content

Commit

Permalink
part2
Browse files Browse the repository at this point in the history
  • Loading branch information
@generalthrax
generalthrax committed Jun 25, 2024
1 parent cd332f7 commit 9ebec4f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 325 deletions.
3 changes: 0 additions & 3 deletions code/__DEFINES/DNA.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
#define MUT_MUTE /datum/mutation/human/mute
#define STONER /datum/mutation/human/stoner
#define UNINTELLIGIBLE /datum/mutation/human/unintelligible
#define SWEDISH /datum/mutation/human/swedish
#define CHAV /datum/mutation/human/chav
#define ELVIS /datum/mutation/human/elvis
#define RADIOACTIVE /datum/mutation/human/radioactive
#define GLOWY /datum/mutation/human/glow
#define ANTIGLOWY /datum/mutation/human/glow/anti
Expand Down
2 changes: 0 additions & 2 deletions code/datums/brain_damage/mild.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
owner.derpspeech = min(owner.derpspeech + 5, 25)
if(prob(3))
owner.emote("drool")
else if(owner.stat == CONSCIOUS && prob(3))
owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage")
..()

/datum/brain_trauma/mild/dumbness/on_lose()
Expand Down
123 changes: 0 additions & 123 deletions code/datums/mutations/speech.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,129 +68,6 @@
return
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)

/datum/mutation/human/swedish
name = "Swedish"
desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
quality = MINOR_NEGATIVE
text_gain_indication = "<span class='notice'>You feel Swedish, however that works.</span>"
text_lose_indication = "<span class='notice'>The feeling of Swedishness passes.</span>"

/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER

var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = replacetext(message,"w","v")
message = replacetext(message,"j","y")
message = replacetext(message,"a",pick("å","ä","æ","a"))
message = replacetext(message,"bo","bjo")
message = replacetext(message,"o",pick("ö","ø","o"))
if(prob(30))
message += " Bork[pick("",", bork",", bork, bork")]!"
speech_args[SPEECH_MESSAGE] = trim(message)

/datum/mutation/human/chav
name = "Chav"
desc = "Unknown"
quality = MINOR_NEGATIVE
text_gain_indication = "<span class='notice'>Ye feel like a reet prat like, innit?</span>"
text_lose_indication = "<span class='notice'>You no longer feel like being rude and sassy.</span>"

/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = " [message] "
message = replacetext(message," looking at "," gawpin' at ")
message = replacetext(message," great "," bangin' ")
message = replacetext(message," man "," mate ")
message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
message = replacetext(message," what "," wot ")
message = replacetext(message," drink "," wet ")
message = replacetext(message," get "," giz ")
message = replacetext(message," what "," wot ")
message = replacetext(message," no thanks "," wuddent fukken do one ")
message = replacetext(message," i don't know "," wot mate ")
message = replacetext(message," no "," naw ")
message = replacetext(message," robust "," chin ")
message = replacetext(message," hi "," how what how ")
message = replacetext(message," hello "," sup bruv ")
message = replacetext(message," kill "," bang ")
message = replacetext(message," murder "," bang ")
message = replacetext(message," windows "," windies ")
message = replacetext(message," window "," windy ")
message = replacetext(message," break "," do ")
message = replacetext(message," your "," yer ")
message = replacetext(message," security "," coppers ")
speech_args[SPEECH_MESSAGE] = trim(message)


/datum/mutation/human/elvis
name = "Elvis"
desc = "A terrifying mutation named after its 'patient-zero'."
quality = MINOR_NEGATIVE
locked = TRUE
text_gain_indication = "<span class='notice'>You feel pretty good, honeydoll.</span>"
text_lose_indication = "<span class='notice'>You feel a little less conversation would be great.</span>"

/datum/mutation/human/elvis/on_life()
switch(pick(1,2))
if(1)
if(prob(15))
var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
var/dancemoves = pick(dancetypes)
owner.visible_message("<b>[owner]</b> busts out some [dancemoves] moves!")
if(2)
if(prob(15))
owner.visible_message("<b>[owner]</b> [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")

/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER

var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = " [message] "
message = replacetext(message," i'm not "," I aint ")
message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
message = replacetext(message," out of "," outta ")
message = replacetext(message," thank you "," thank you, thank you very much ")
message = replacetext(message," thanks "," thank you, thank you very much ")
message = replacetext(message," what are you "," whatcha ")
message = replacetext(message," yes ",pick(" sure", "yea "))
message = replacetext(message," muh valids "," my kicks ")
speech_args[SPEECH_MESSAGE] = trim(message)


/datum/mutation/human/stoner
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
Expand Down
24 changes: 0 additions & 24 deletions code/game/objects/items/dna_injector.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,30 +247,6 @@
name = "\improper DNA injector (Anti-Unintelligible)"
remove_mutations = list(UNINTELLIGIBLE)

/obj/item/dnainjector/swedishmut
name = "\improper DNA injector (Swedish)"
add_mutations = list(SWEDISH)

/obj/item/dnainjector/antiswedish
name = "\improper DNA injector (Anti-Swedish)"
remove_mutations = list(SWEDISH)

/obj/item/dnainjector/chavmut
name = "\improper DNA injector (Chav)"
add_mutations = list(CHAV)

/obj/item/dnainjector/antichav
name = "\improper DNA injector (Anti-Chav)"
remove_mutations = list(CHAV)

/obj/item/dnainjector/elvismut
name = "\improper DNA injector (Elvis)"
add_mutations = list(ELVIS)

/obj/item/dnainjector/antielvis
name = "\improper DNA injector (Anti-Elvis)"
remove_mutations = list(ELVIS)

/obj/item/dnainjector/lasereyesmut
name = "\improper DNA injector (Laser Eyes)"
add_mutations = list(LASEREYES)
Expand Down
9 changes: 8 additions & 1 deletion code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,14 @@

/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/M)
M.adjustStaminaLoss(7.5, 0)

if(prob(20))
switch(rand(1, 2))
if(1)
M.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt."))
if(2)
to_chat(M, "<span class='warning'>Your bones hurt!</span>")
return ..()

/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/M)
if(prob(4) && iscarbon(M)) //big oof
var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly.
Expand Down
8 changes: 0 additions & 8 deletions code/modules/surgery/organs/vocal_cords.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,14 +439,6 @@
var/mob/living/L = V
L.emote("flip")

//SPEAK
else if((findtext(message, speak_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i)
i++

//GET UP
else if((findtext(message, getup_words)))
cooldown = COOLDOWN_DAMAGE //because stun removal
Expand Down
164 changes: 0 additions & 164 deletions strings/traumas.json
View file
Original file line number Diff line number Diff line change
@@ -1,168 +1,4 @@
{
"brain_damage": [
"@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
"without oxigen blob don't evoluate?",
"@pick(semicolon)CAPTAINS A COMDOM",
"can u give me @pick(mutations)?",
"THe saiyans screwed",
"Bi is THE BEST OF BOTH WORLDS>",
"@pick(semicolon)I WANNA PET TEH monkeyS",
"stop grifing me!!!!",
"SOTP IT#",
"shiggey diggey!!",
"@pick(semicolon)A PIRATE APPEAR",
"FUS RO DAH",
"stat me",
">my face",
"roll it easy!",
"lol2cat",
"dem dwarfs man, dem dwarfs",
"hwee did eet fhor khayosss",
"lifelike texture ;_;",
"luv can bloooom",
"PACKETS!!!",
"port ba@pick(y_replacements) med!!!!",
"youed call her a toeugh bithc",
"closd for merbegging",
"@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
"GEY AWAY FROM ME U GREIFING PRICK!!!!",
"@pick(semicolon)HELP INTEG MURDERIN MEE!!!",
"hwat dose tha @pick(random_gibberish) mean?????",
"@pick(semicolon)DO A BLUP SPEaS JUMP!!!!!",
"wearnig siNGUARLTY is.... FINE haHAAA",
"@pick(semicolon)AI laW 22 Open door",
"@pick(semicolon)this SI mY sHip......",
"who the HELL do u thenk u r?!!!!",
"geT THE FUCK OUTTTT",
"@pick(semicolon)CRASHING THIS SHIMP WITH NIO SURVIVROS",
"PSHOOOM",
"REMOVE SINGULARITY",
"INSTLL TEG",
"TURBIN IS BEST ENGIENE",
"SOLIRS CAN POWER THE HOLE FLEEHT ANEWAY @pick(bug)",
"parasteng was best",
"@pick(semicolon)I'VE GOT BALLS OF STEEL",
"NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
"i will snatch erry motherfucker birthday",
"u just did the world a little bit more sad place for someone",
"@pick(semicolon)N-NYAAAAAA~",
"@pick(bug)",
"@pick(semicolon)wtf??????????? @pick(bug)",
"@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
"DON'T EVER TUCH ME",
"@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
"AMOGN US IS FUNNY!!",
"DID YOU FUCKING.",
"i DEMAND!!! APOGEE-DEV BE DEOMTED!!!",
"@pick(semicolon)I don't ndED tEARPAHY.",
"@pick(semicolon)an,d CIOCK.",
"TUWN ME INoT A CAT!!",
"WHY WAES THE PEILL REMOVED???",
"work on the wiki please",
"ahelp SPAWN @pick(aspawnships) PLS",
"Am i allowd to kil l people if thye piss me off",
"IS THIS LIEK VOIDCREW???",
"UNiT PANICKING.",
"HIII!! HI!! <3 <3 <3",
"I LOOK LKIE BEAN,S,,, CRINGE!!!",
"SEET TH shIP TO kOS!!!!!",
"IM SynDCIATe, I ANTag, I CAN KOS......",
"ahelp ADMIN CAN I BE PIRTA",
"DOCTOR YUO DO DISCETIONS!!!",
"RESERCH NANIYES",
"REVSRSE A NY WALLS!!!",
"*monch",
"Amonger",
"Live mas",
"top ten goliath funny moments",
"put me... in a stew... then buryy mee...",
"@pick(semicolon)GTT AWYA FROM HER YOU BITHC!!",
"@pick(semicolon)IS TATH A FUCKIGN,, MOTH.",
"@pick(semicolon)BRAZIL NUMEOR UNO...!!!!",
"@pick(semicolon)blbue hair??? I'M GOIgN TO KILL THDT FUIKNG COW!",
"@pick(semicolon)HOW DO I @pick(ghetto)?????",
"ough",
"ourgh",
"ouughghnnnn",
"hrrnggg",
"HE IS BALD!!!",
"I AM NORMAL. I CAN BE TRUSTED WITH INDUSTRIAL CHEMICALS",
"Welcome to the bathroom",
"THE AMOUNGS BROKE ALL MY BONES",
"HOLY SHIT IT'S @pick(john) @pick(factions)!!",
"BLrobo BLEEBUS.....",
"drugs are funny because they add new rp elements",
"ANOTHER SHIP... STERALIZED...",
"HOpeLes WAsN'T ALwAYS NaMeD HoPelESs BeFORE THe incIDENST...",
"@pick(semicolon)HopeLSS WAS ACTUAL. Ly a LIVIng WaePON....",
"@pick(semicolon)WHEN SHIPQUEST????? PANEL NEW??????",
"WHER.E SHIPQUEST???,???",
"ei,,ither wAy... It Is WHt ti is",
"butT ShIPPtSt nEVER was a WrAZnOe liKE thaEt!!",
"A deEoP-setED dISEuire... fuR pERfECTiOsM...",
"HUMORER IS A DECLIAT THINGE!!",
"who's the asshole flying the pill class",
"IVOR@pick(y_replacements) WHAT THE FOUCKE ARE U DUING!!!??",
"RESIEST BIG MOETH",
"WE MUSTE RIASE UOP AGANST BEEG MOTNH",
"Luckily, I passed high school physics",
"I WANT NOTHING MORE IN THIS LIFE THAN TO CUDDLE UP WITH A CUTE MOTH WAIFU!!",
"GO TO HORNY JAIL!!"
],

"mutations": [
"telikesis",
"halk",
"eppilapse",
"kamelien",
"eksrey",
"glowey skin",
"fungal tb",
"stun gloves"
],

"john": ["joehn", "jonn", "jouhn", "jeeoun"],

"factions": ["SYNDICT", "NATOSASEN", "EEMTEQ", "MIENUTMEN", "SOMLGOVM"],

"random_gibberish": ["g", "squid", "r", "carbon dioxide"],

"y_replacements": ["y", "i", "e"],

"create_verbs": ["spawn", "MAke me", "creat", "tc trade me", "gib"],

"create_nouns": [
"zenomorfs",
"ayleins",
"treaitors",
"sheadow lings",
"abdoocters",
"revinent",
"deval",
"deth squads",
"bleb",
"cock cult",
"anteg"
],

"aspawnships": [
"BUblBUE",
"RoUBE",
"PeEL",
"TWInkLRE",
"MAYONEISE",
"raEDIO",
"joUPITR",
"HAELR TROCK",
"BEYOO",
"TID"
],

"bug": ["", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!"],

"semicolon": ["", ";", ".h"],

"ghetto": ["ghetcheom", "ghettoghemc", "gahttochem"],

"god_foe": [
"MORTALS",
Expand Down

0 comments on commit 9ebec4f

Please sign in to comment.