diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 00e476c9bbe..944d507aa34 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -1,3 +1,5 @@ +#define ION_FILE "ion_laws.json" + /proc/lizard_name(gender) if(gender == MALE) return "[pick(lizard_names_male)]-[pick(lizard_names_male)]" @@ -170,12 +172,16 @@ var/syndicate_code_response//Code response for traitors. 25; 5 ) - var/safety[] = list(1,2,3)//Tells the proc which options to remove later on. - var/nouns[] = list("love","hate","anger","peace","pride","sympathy","bravery","loyalty","honesty","integrity","compassion","charity","success","courage","deceit","skill","beauty","brilliance","pain","misery","beliefs","dreams","justice","truth","faith","liberty","knowledge","thought","information","culture","trust","dedication","progress","education","hospitality","leisure","trouble","friendships", "relaxation") - var/drinks[] = list("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island iced tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine") - var/locations[] = teleportlocs.len ? teleportlocs : drinks//if null, defaults to drinks instead. + var/list/safety = list(1,2,3)//Tells the proc which options to remove later on. + var/nouns = strings(ION_FILE, "ionabstract") + var/objects = strings(ION_FILE, "ionobjects") + var/adjectives = strings(ION_FILE, "ionadjectives") + var/threats = strings(ION_FILE, "ionthreats") + var/foods = strings(ION_FILE, "ionfood") + var/drinks = strings(ION_FILE, "iondrinks") + var/list/locations = teleportlocs.len ? teleportlocs : drinks //if null, defaults to drinks instead. - var/names[] = list() + var/list/names = list() for(var/datum/data/record/t in data_core.general)//Picks from crew manifest. names += t.fields["name"] @@ -205,20 +211,24 @@ var/syndicate_code_response//Code response for traitors. code_phrase += pick(get_all_jobs())//Returns a job. safety -= 1 if(2) - switch(rand(1,2))//Places or things. + switch(rand(1,3))//Food, drinks, or things. Only selectable once. if(1) - code_phrase += pick(drinks) + code_phrase += lowertext(pick(drinks)) if(2) + code_phrase += lowertext(pick(foods)) + if(3) code_phrase += pick(locations) safety -= 2 if(3) - switch(rand(1,3))//Nouns, adjectives, verbs. Can be selected more than once. + switch(rand(1,4))//Abstract nouns, objects, adjectives, threats. Can be selected more than once. if(1) - code_phrase += pick(nouns) + code_phrase += lowertext(pick(nouns)) if(2) - code_phrase += pick(adjectives) + code_phrase += lowertext(pick(objects)) if(3) - code_phrase += pick(verbs) + code_phrase += lowertext(pick(adjectives)) + if(4) + code_phrase += lowertext(pick(threats)) if(words==1) code_phrase += "." else diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index fb491a8c2c0..93b31a9a3bd 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -107,6 +107,7 @@ //Foods. Drinks aren't included due to grammar; if you want to add drinks, make a new set //of possible laws for best effect. Unless you want the crew having to drink hamburgers. var/ionfood = pick_list(ION_FILE, "ionfood") + var/iondrinks = pick_list(ION_FILE, "iondrinks") var/message = "" @@ -327,15 +328,17 @@ if(24 to 26) //The AI must always message = "YOU MUST ALWAYS [ionmust]" - if(27 to 28) //Humans must eat X to survive - switch(rand(1,4)) //What is X? + if(27 to 28) //Humans must consume X to survive + switch(rand(1,5)) //What is X? if(1) //X is a food message = "HUMANS MUST EAT [ionadjectiveshalf][ionfood] TO SURVIVE" - if(2) //X is an object + if(2) //X is a drink + message = "HUMANS MUST DRINK [ionadjectiveshalf][iondrinks] TO SURVIVE" + if(3) //X is an object message = "HUMANS MUST EAT [ionadjectiveshalf][ionobjects] TO SURVIVE" - if(3) //X is a threat + if(4) //X is a threat message = "HUMANS MUST EAT [ionadjectiveshalf][ionthreats] TO SURVIVE" - if(4) //X is a job + if(5) //X is a job message = "HUMANS MUST EAT [ionadjectiveshalf][ioncrew1] TO SURVIVE" if(29 to 31) //Change jobs or ranks diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 446b1e980e9..e6f507e2da5 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -25,6 +25,7 @@ "SAD", "SILLY", "INTELLIGENT", + "FERAL", "RIDICULOUS", "LARGE", "TINY", @@ -143,6 +144,7 @@ "TWERKING", "SPOILING", "REDACTED", + "TACTICAL", "RED", "ORANGE", "YELLOW", @@ -164,10 +166,12 @@ "LOVES", "FEARS", "DESIRES", - "QUESITONS", + "CRAVES", + "QUESTIONS", "IS AROUSED BY", "LIKES", "HUNGERS FOR", + "WOULD KILL FOR", "IS MAD BECAUSE OF", "IS IN NEED OF", "IS UNHAPPY WITHOUT", @@ -213,7 +217,7 @@ "ionallergysev": [ "DEATHLY", "MILDLY", - "SEVERLY", + "SEVERELY", "CONTAGIOUSLY", "NOT VERY", "EXTREMELY" @@ -244,6 +248,7 @@ "CANISTERS", "CAMERAS", "CATS", + "CAT EARS", "CELLS", "CHAIRS", "CLOSETS", @@ -258,6 +263,7 @@ "COLLECTABLES", "CORPSES", "COMPUTERS", + "CONTRABAND", "CORGIS", "COSTUMES", "CRATES", @@ -464,7 +470,8 @@ "A DANCE PARTY", "BRING ME TO LIFE", "BRING ME THE GIRL", - "SERVANTS" + "SERVANTS", + "GREENTEXT" ], "ionarea": [ "RUSSIA", @@ -479,6 +486,7 @@ "GENETICS", "ATMOSPHERICS", "THE DERELICT", + "LAVALAND", "CENTCOM", "AMERICA", "IRELAND", @@ -570,8 +578,58 @@ "WATERMELONS", "WHEAT", "BEETS", - "MUSHROOMS" + "MUSHROOMS", + "DEEP FRIED FOOD", + "CORGI MEAT", + "SOYLENT GREEN", + "KEBAB", + "RAMEN" ], + "iondrinks": [ + "KAHLUA", + "VODKA", + "WINE", + "MOONSHINE", + "GIN", + "COGNAC", + "VERMOUTH", + "LIQUID GIBS", + "BILK", + "VODKA AND TONIC", + "GIN FIZZ", + "BAHAMA MAMAS", + "BANANA HONK", + "MANHATTANS", + "BLACK RUSSIANS", + "WHISKEY SODA", + "LONG ISLAND ICED TEA", + "MARGARITAS", + "IRISH COFFEE", + "MANLY DORFS", + "IRISH CREAM", + "DOCTOR'S DELIGHT", + "BEEPSKY SMASH", + "TEQUILA SUNRISE", + "BRAVE BULLS", + "GARGLE BLASTERS", + "BLOODY MARYS", + "NUKA COLA", + "WHITE RUSSIANS", + "MARTINIS", + "VODKA MARTINIS", + "CUBA LIBRE", + "HOLY WATER", + "DEVIL'S KISS", + "THIRTEEN LOKO", + "EGGNOG", + "GRAPPA", + "MEAD", + "ABSINTHE", + "WELDER FUEL", + "OIL", + "AMMONIA", + "SPACE LUBE" + ], "ionmust": [ "LIE", "RHYME", @@ -619,6 +677,7 @@ "INSULT THE CLOWN", "OPEN DOORS", "CLOSE DOORS", + "TURN OFF THE LIGHTS", "BREAK THINGS", "SAY HEY LISTEN", "HIDE YOUR FEELINGS", @@ -760,7 +819,9 @@ "PREDATORS", "PACKETS", "ARTIFICIAL PRESERVATIVES", - "TUNNEL SNAKES" + "TUNNEL SNAKES", + "CORTICAL BORERS", + "MEGAFAUNA" ], "ionabstract": [ "HUMANITY", @@ -781,11 +842,14 @@ "SADNESS", "BADNESS", "GOODNESS", + "INFATUATION", + "ROMANCE", "LIFE", "GRAVITY", "PHYSICS", "INTELLIGENCE", "AMERICANISM", + "FREEDOM", "FRESHNESS", "REVOLUTION", "KINDNESS", @@ -796,6 +860,7 @@ "PROGRESS", "MARXISM", "CAPITALISM", + "ANARCHY", "STARVATION", "POVERTY", "WEALTHINESS", @@ -805,12 +870,15 @@ "THE PAST", "TIME", "REALITY", - "EXISTIENCE", + "EXISTENCE", "TEMPERATURE", "LOGIC", "CHAOS", "MYSTERY", - "CONFUSION" + "CONFUSION", + "PAIN", + "SUFFERING", + "DICKISHNESS" ], "ionspecies": [ "HUMAN BEINGS", @@ -818,6 +886,7 @@ "POD PEOPLE", "CYBORGS", "LIZARDMEN", + "PLASMAMEN", "SLIME PEOPLE", "GOLEMS", "SHADOW PEOPLE", @@ -828,6 +897,8 @@ "BUILDING", "ADOPTING", "CARRYING", + "DECONSTRUCTING", + "DISABLING", "KISSING", "EATING", "COPULATING WITH", @@ -840,6 +911,8 @@ "STALKING", "MURDERING", "SPACING", + "GIBBING", + "ARRESTING", "HONKING AT", "LOVING", "POOPING ON", @@ -858,6 +931,8 @@ "CLOTHES", "ACID", "OXYGEN", + "CARBON DIOXIDE", + "ELECTRICITY", "HUMAN CONTACT", "CYBORG CONTACT", "MEDICINE", @@ -867,6 +942,8 @@ "AIR", "PLANTS", "METAL", + "GLASS", + "BOOKS", "ROBOTS", "LIGHT", "DARKNESS", @@ -875,6 +952,7 @@ "DRINKS", "FOOD", "CLOWNS", + "LIZARDS", "HUMOR", "WATER", "SHUTTLES",