From 42092f37c6d9537328404d3db03d540321185b7b Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 18 Sep 2018 23:46:47 -0500 Subject: [PATCH] readds braindamage memes --- code/modules/mob/living/carbon/human/life.dm | 2 +- strings/traumas.json | 84 +++++++++++++++++++- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cc37d46563..789a52250c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -70,7 +70,7 @@ else if(eye_blurry) //blurry eyes heal slowly adjust_blurriness(-1) - if (getBrainLoss() >= 60) + if (getBrainLoss() >= 30) //Citadel change to make memes more often. SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "brain_damage", /datum/mood_event/brain_damage) if(prob(3)) if(prob(25)) diff --git a/strings/traumas.json b/strings/traumas.json index e013264c4e..9394f11f3a 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -58,12 +58,57 @@ "@pick(semicolon)the ai and borgs are mettacomming I think", "u just did the world a little bit more sad place for someone", "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?", + "CEMISTRY SUKS!!!!!!!!", + "youed call her a toeugh bithc", + "git gud!!", + "CHEMIT GIB HALNOM PLS", + "PLASMA iS MENT 2 BE FREE", + "LoL tROLED U", + "SEC IS A REV, LINCH!!", + "FUCK U IM WAY MORE ROBUST u bITCH!!1!!", + "iS tHis bay?", + "NO PRED CAN eVER CATCH MI", + "SCIENCE GIB SHINK RAY PLS", + "KILL PUNPUN 4 FUN xDD", + "ooc wow rly?", + "i play @pick(roles) to only ORDER not DO", + "CRAGO ORDER @pick(cargo) PLS", + "erp?", + "i want to digest u!!!", + "i shure hop dere are no PRED arund!!!!", + "NOM!1!", + "iF it COMPILES it werks!", + "LYNCH RObOTIKS NOT GIBING ME MECH WTF?/?", + "GWURGLE!!", + "balid saled!", + "LINCH VIRO", + "VIRO GIB SuPR VIrUS!!", + "Ai plai vxtest2!", + "ahelp kan i b pick@(s_roles)???", + ";taitor trie to make meh malk/?!1!!", + ";ENGIE TATOR HE SET UP SINGULO!!!11", + "WHEN NAGAS ADdED?/?", + "SINDYIE ON SAtIONS GiB gUNS PLISE", + "CcLOWN IV SlIPPING MI, SEc t BAR@", + "ahelp iT's RP vALiDZ!", + "HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT1!!!", + "HALP GOLIATH TENETCAL RAPPPP!!!!111", + "DudSE it'S 4:20 LmAO BLAZZ IT xDDDDD", + "ahelp DUDE I JUT LOST MY JOBB!!", + "looc dude rly", + "pray can i heff spells", + "aI state dem1!", + "SINGULO eNGINE 2 DANGER, SOLARS PLS!", + "nerf blob!1", + "iM NOT A FUWRRYY!!!", + "FOURTEEN INCHES SOFT!!!", "@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)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS" + "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS", + "@pick(semicolon) DOOR STUCK!!" ], "mutations": [ @@ -113,6 +158,11 @@ "sybl", "mrs sybil", "mr basil", + "sisadel", + "dullus", + "colon marhens", + "haylo", + "EEGEE", "mr terry", "berry" ], @@ -136,7 +186,8 @@ "", "IS TIS A BUG??", "SI IST A BUGG/", - "BUG!!!" + "BUG!!!", + "HUE, FEATURE!!" ], "semicolon": [ @@ -193,6 +244,31 @@ "YOU SHALL SURVIVE THIS, MY PRIEST.", "BE HEALED, PRIEST.", "YOUR LIFE IS IMPORTANT. KEEP IT." - ] + ], -} + "roles": [ + "heds", + "ceptin", + "hop", + "arrdee", + "sek" + ], + + "cargo": [ + "GUNS", + "HATS", + "PIZEH", + "MEMES", + "GLOWY CYSTAL" + ], + + "s_roles": [ + "ert", + "shadowlig", + "ninja", + "admen", + "mantor", + "bluh daymon", + "wizzerd" + ] +} \ No newline at end of file