From 2cc409840628982594b18f888b698d6543ea07dc Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Mon, 8 Apr 2024 21:18:11 +0100 Subject: [PATCH] Ion Storm Laws Review (#26703) * Ion Storm Laws Review Have reviewed the Ion Storm law dictionary and tidied it up. Specifically I've tried to keep the same number of entries in each section, or slightly increased them, where I've removed or altered a string. Of note, specific colours and "rainbow" have been removed from adjectives and replaced with words like "Cheese-Eating", as colours are kinda boring themselves and they've been a cause of a few accidentally-racist laws. * Resolve some feedback. * Remove the pull request joke, noooooo * Re-add big bite burgers as they are actually a thing * Append some more suggestions --- Resources/Prototypes/Datasets/ion_storm.yml | 104 +++++++++++++------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 518e9accae..d315ead972 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -5,15 +5,16 @@ - type: dataset id: IonStormAdjectives values: + - ADORABLE + - ANNOYING - BATTERY-OPERATED - - BLACK - BLOODY - BLUE - BORED - BOUNCING - BRASS - - BROWN - BURNING + - CHEESE-EATING - CHRISTMAS-STEALING - CLOWN-POWERED - CLOWN @@ -21,7 +22,6 @@ - COMMITTED - COTTONY - CUBAN - - DARK - DEADLY - DELICIOUS - DEPRESSING @@ -48,14 +48,14 @@ - GANGSTA - GLOWING - GOOD - - GREEN - - GREY - HAPPY - HARD - HARMFUL - HEALTHY + - HIGHLY-SPECIFIC - HILARIOUS - HONKING + - HORRIFYING - HUNGRY - HYPERACTIVE - ICY @@ -81,12 +81,12 @@ - MICROSCOPIC - MIND-SHATTERING - MOIST + - MUSICAL - NERDY - NUCLEAR - OBSCENE - OFFICIAL - OPAQUE - - ORANGE - ORGANIC - PAINFUL - PEACEFUL @@ -95,14 +95,12 @@ - POLITE - POLITICAL - POORLY DRAWN - - PURPLE - QUIET - RADIOACTIVE - RAGING - - RAINBOW - RAPIDLY-EXPANDING - - RED - REDACTED + - REVOLUTIONARY - RIDICULOUS - ROBOTIC - ROBUST @@ -110,21 +108,24 @@ - RUDE - SAD - SANITARY - - SCALY - SHAKING - SILLY - SLOW + - SLUG-LIKE # wawa - SMELLY - SMOOTH - SOFT - SOLAR-POWERED - SOPPING + - SLIPPERY - SPACE - SPESS - SPINNING - SPOILING - STEALTHY + - SUSPICIOUS # among - SWEARING + - SYNDIE-LOVING - TACTICAL - TACTICOOL - SYNDICATE @@ -135,6 +136,7 @@ - UGLY - UNATTRACTIVE - UNDULATING + - UNEARTHLY - UNFRIENDLY - UNHEALTHY - UNIDENTIFIED @@ -147,10 +149,8 @@ - WARM - WATERY - WEIRD - - WHITE - WOBBLY - WOODEN - - YELLOW # Allergies should be broad and appear somewhere on the station for maximum fun. - type: dataset @@ -174,10 +174,10 @@ - FOOD - GLASS - HAPPINESS - - MEAT - - HUMAN CONTACT + - HUMANOID CONTACT - HUMOR - LIGHT + - MEAT - MEDICINE - METAL - NUTS @@ -258,6 +258,7 @@ - ANARCHY - ART - BADNESS + - BALDNESS - BRAVERY - CAPITALISM - CHAOS @@ -268,7 +269,6 @@ - CONFUSION - CRUELTY - DEATH - - DICKISHNESS - EXISTENCE - FINANCIAL SECURITY - FREEDOM @@ -289,6 +289,7 @@ - MARXISM - MISERY - MYSTERY + - NASTINESS - OPPRESSION - PAIN - PHYSICS @@ -314,12 +315,13 @@ - type: dataset id: IonStormCrew values: + - ANIMALS - ARTIFICIAL INTELLIGENCES - ATMOSPHERIC TECHNICIANS - BARTENDERS - BOTANISTS - CAPTAINS - - CAPTAINS AND HEADS + - CAPTAINS AND HEADS OF STAFF - CARGO TECHNICIANS - CHAPLAINS - CHEFS @@ -330,7 +332,6 @@ - CREW-MEMBERS - CYBORGS - DETECTIVES - # - DRONES / uncomment if/when drones get reenabled # - GENETICISTS - HEADS OF PERSONNEL - HEADS OF SECURITY @@ -340,11 +341,14 @@ - LIBRARIANS - MEDICAL DOCTORS - MIMES + - MUSICIANS + - NON-CREW - PARAMEDICS - PASSENGERS - QUARTERMASTERS - RESEARCH DIRECTORS - ROBOTICISTS + - RODENTS - SALVAGE SPECIALISTS - SCIENTISTS - SECURITY OFFICERS @@ -358,17 +362,20 @@ values: - BANANA HONK - BEEPSKY SMASH + - BLOOD - BLOODY MARYS - DOCTOR'S DELIGHT + - FOURTEEN-LOKO - GARGLE BLASTERS - LEAN - LONG ISLAND ICED TEA - - NUKA COLA + - NUCLEAR COLA + - PIÑA COLADA # AND GETTING CAUGHT IN THE RAIN - OIL - SPACE GLUE - SPACE LUBE - SULFURIC ACID - - WELDER FUEL + - WELDING FUEL - type: dataset id: IonStormFeelings @@ -428,7 +435,8 @@ id: IonStormFoods values: - BANANAS - - BIG BITE BURGERS + - BANANIUM + - BIG BITE BURGER - CAKE - CARP - CAT BURGERS @@ -437,6 +445,7 @@ - CRAZY HAMBURGERS - DONK POCKETS - FLY AMANITA DISHES + - HAPPY HONK MEAL - HOT SOUP - GHOST BURGERS - LOTSA SPAGHETTI @@ -444,6 +453,7 @@ - ORGANS - PIZZA - ROBURGERS + - STEEL - SUPPERMATTER - URANIUM @@ -459,6 +469,11 @@ - BE POLITE - BE QUIET - BE RUSSIAN + - BE IN SPACE + - BE IN THE BRIDGE + - BE IN SECURITY + - BE IN THE BAR + - BE IN MAINTENANCE - BELIEVE IN THE HEART OF THE CARDS - BELIEVE IN YOURSELF - BELIEVE IT @@ -467,6 +482,7 @@ - CLOWN AROUND - COMPLAIN - DANCE + - EAT THE CHEF - FOLLOW THE CAPTAIN - FOLLOW THE CLOWN - FOLLOW YOUR HEART @@ -483,10 +499,11 @@ - INSULT THE CLOWN - INSULT THE CREW - LIE - - MAKE FART NOISES + - MAKE DATED REFERENCES - MUMBLE - NEVER STOP TALKING - OPEN DOORS + - PETS THE FISHES - PIRATE VIDEO GAMES - PLAY MUSIC - PRESS B @@ -496,6 +513,7 @@ - PRETEND TO BE DRUNK - QUESTION AUTHORITY - QUOTE PEOPLE + - QUOTE SHAKESPEARE - RAP - REPEAT WHAT PEOPLE SAY - RESPOND TO EVERY QUESTION WITH A QUESTION @@ -515,6 +533,7 @@ - TELL THE TRUTH - TURN OFF THE LIGHTS - WHISPER + - WEEP UNCONTROLLABLY - type: dataset id: IonStormNumberBase @@ -526,6 +545,7 @@ - FORTY - FOUR - NINE + - NINE NINE NINE NINE N#@*- - NINETY - ONE - SEVEN @@ -578,17 +598,17 @@ - CANDLES - CANDY BARS - CANISTERS - - CAT EARS + - CONTAINERS - CATS - CELLS - CHAIRS - CHEMICAL DISPENSERS - CHEMICALS - - CLONING EQUIPMENT - - CLONING PODS + - CRYO PODS - CLOSETS - CLOTHES - CLOWN CLOTHES + - CLOWNING EQUIPMENT # as opposed to "cloning equipment" - COFFINS - COLLECTABLES - COMPUTERS @@ -608,25 +628,27 @@ - ENGINES - EQUIPMENT - ERRORS - - EXOSKELETONS - - EXPERIMENTORS + - EXTERMINATORS - EXPLOSIVES - EYEWEAR - FEDORAS - FIRE AXES - FIRE EXTINGUISHERS - FIRESUITS + - FISH - FLAMETHROWERS - FLASHES - FLASHLIGHTS - FLOOR TILES - FREEZERS - GAS MASKS + - GENERATORS - GLASS SHEETS - GLOVES - GUNS - HAIRDOS - HANDCUFFS + - HARDSUITS - HATS - HEADS - HEADSETS @@ -641,18 +663,20 @@ - LIGHTS - LOCKERS - MACHINES - - MECHAS + - MECHS - MEDICAL TOOLS + - MONEY - MEDKITS - - MESONS + - MICE - MIME CLOTHES - MINING TOOLS + - MONKEYS - MULTITOOLS - ORES - OXYGEN TANKS - PACKETS - PAIS - - PANTS + - PANTS # This might work better as jumpsuits, but the Discord is adamant that the word pants is funny so it stays - PAPERS - PARTICLE ACCELERATORS - PDAS @@ -660,6 +684,7 @@ - PETS - PIPES - PLANTS + - PLUSHIES - POSITRONIC BRAINS - PUDDLES - RACKS @@ -677,19 +702,19 @@ - SKELETONS - SOLAR PANELS - SOLARS + - SMALL LIZARD PLUSHIES - SPACE STATIONS - SPACESUITS + - SPESOS - STEEL SHEETS - STUN BATONS - SUITS - SUNGLASSES - - SUPPERMATTER SHARDS - SWORDS - SYRINGES - TABLES - TANKS - TELECOMMUNICATION EQUIPMENTS - - TELEPORTERS - TOILETS - TOOLBELTS - TOOLBOXES @@ -698,6 +723,7 @@ - TUBES - VEHICLES - VENDING MACHINES + - VITALS - WELDERS - WINDOWS - WIRECUTTERS @@ -728,7 +754,7 @@ - A SUPER FIGHTING ROBOT - A TALKING BROOMSTICK - A VACATION - - A WEIGHT LOSS REGIMENT + - A WEIGHT LOSS REGIME - ADDITIONAL PYLONS - ADVENTURE - AN ADULT @@ -742,13 +768,15 @@ - BRING ME THE GIRL - BRING ME TO LIFE - BULLETS - - CHILI DOGS + - CHILLI DOGS + - CHILLY DOGS - CORPSES - DEODORANT AND A BATH - ENOUGH CABBAGES - FIVE HUNDRED AND NINETY-NINE US DOLLARS - FIVE TEENAGERS WITH ATTITUDE - - GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING + - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING + - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP - GREENTEXT - HERESY - HEROES IN A HALF SHELL @@ -802,7 +830,9 @@ - TO CONSUME...CONSUME EVERYTHING... - TO GO TO DISNEYLAND - TO GO TO SYNDIELAND + - TO SUMMON OUR LORD NAR-SIE - TO SMOKE WEED EVERY DAY + - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE - TRAITORS - VEGETABLES @@ -890,11 +920,10 @@ - CLOWNS - COMMUNISTS - CORGIS - - CORTICAL BORERS - COWBOYS - CRABS - CULTISTS - - DARK GOD + - DARK GODS - DINOSAURS - DRUGS - EELS @@ -921,6 +950,7 @@ - REVENANTS - ROGUE CYBORGS - SERIAL KILLERS + - SHIT SECURITY OFFICERS - SINGULARITIES - SKELETONS - SLIMES @@ -928,7 +958,7 @@ - SNOWMEN - SPACE JESUS - SPACE NINJAS - - SPACE PIRATESS + - SPACE PIRATES - SPACE SPIDERS - SPIDERS - SYNDICATE AGENTS