From 194caf5f5e211f342e34b576879c4b5500f94abe Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 00:56:11 +0000 Subject: [PATCH 1/7] Update TGS DMAPI --- code/modules/tgs/core/datum.dm | 2 -- code/modules/tgs/v3210/api.dm | 2 +- code/modules/tgs/v3210/commands.dm | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index e6c000ff8e2c..3ca53e9bf7c6 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -11,8 +11,6 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) src.event_handler = event_handler src.version = version -// chumbis - /datum/tgs_api/proc/TerminateWorld() while(TRUE) TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]") diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index 5c6ec250088c..666201a32256 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -143,7 +143,7 @@ if(SERVICE_CMD_LIST_CUSTOM) return json_encode(ListServiceCustomCommands(FALSE)) else - var/custom_command_result = HandleServiceCustomCommand(LOWER_TEXT(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM]) + var/custom_command_result = HandleServiceCustomCommand(lowertext(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM]) if(custom_command_result) return istext(custom_command_result) ? custom_command_result : SERVICE_RETURN_SUCCESS return "Unknown command: [command]" diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm index 412dd2113a2d..e65c816320dc 100644 --- a/code/modules/tgs/v3210/commands.dm +++ b/code/modules/tgs/v3210/commands.dm @@ -37,7 +37,7 @@ cached_custom_tgs_chat_commands = list() for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command) var/datum/tgs_chat_command/stc = I - cached_custom_tgs_chat_commands[LOWER_TEXT(initial(stc.name))] = stc + cached_custom_tgs_chat_commands[lowertext(initial(stc.name))] = stc var/command_type = cached_custom_tgs_chat_commands[command] if(!command_type) From c0233411e3487f382c277b54be1013dabd93c256 Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 21:45:47 +0000 Subject: [PATCH 2/7] WIP. --- code/datums/memory/_memory.dm | 4 ++++ code/game/objects/items/food/meatdish.dm | 4 ++++ code/modules/food_and_drinks/recipes/soup_mixtures.dm | 4 +++- .../food_and_drinks/recipes/tablecraft/recipes_guide.dm | 2 ++ .../food_and_drinks/recipes/tablecraft/recipes_martian.dm | 4 +++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index 08a694616a33..a391d50aadfd 100644 --- a/code/datums/memory/_memory.dm +++ b/code/datums/memory/_memory.dm @@ -279,7 +279,11 @@ /mob/living/basic/stickman, /mob/living/basic/stickman/dog, /mob/living/simple_animal/hostile/megafauna/dragon/lesser, + //IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL + /* /obj/item/food/sausage/american, + */ + //IRIS EDIT REMOVAL END /obj/item/skub, ) diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 07b9b3469917..86ad60a90675 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -621,6 +621,8 @@ /obj/item/food/sausage/make_processable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") +//IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL +/* AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") /obj/item/food/sausage/american @@ -630,6 +632,8 @@ /obj/item/food/sausage/american/make_processable() return +*/ +//IRIS EDIT REMOVAL END /obj/item/food/salami name = "salami" diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index cefaf65bc32e..e2a1677b3b34 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -2231,7 +2231,9 @@ required_ingredients = list( /obj/item/food/canned/beans = 1, /obj/item/food/spaghetti/rawnoodles = 1, - /obj/item/food/sausage/american = 1, + //IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL + /obj/item/food/sausage = 1, + //IRIS EDIT CHANGE END /obj/item/food/chapslice = 2, /obj/item/food/kimchi = 1, /obj/item/food/cheese/wedge = 1, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 4d028de06fb2..62c32c26cab3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -321,10 +321,12 @@ result = /obj/item/food/salami category = CAT_MEAT +//IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL /datum/crafting_recipe/food/knife/american_sausage reqs = list(/obj/item/food/sausage = 1) result = /obj/item/food/sausage/american category = CAT_MEAT +//IRIS EDIT REMOVAL END /datum/crafting_recipe/food/knife/tempehslice reqs = list(/obj/item/food/tempeh = 1) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm index a0f60b192216..51b24571900b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm @@ -118,7 +118,9 @@ reqs = list( /obj/item/food/boiledrice = 1, /obj/item/food/onion_slice = 1, - /obj/item/food/sausage/american = 1, + //IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL + /obj/item/food/sausage = 1, + //IRIS EDIT CHANGE END /obj/item/food/grown/carrot = 1, /obj/item/food/grown/peas = 1, /datum/reagent/consumable/ketchup = 5, From 5d0b9afad80722b79868c978e9512f0a8dd71482 Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:13:01 +0000 Subject: [PATCH 3/7] Iris ion laws file. --- code/__DEFINES/text.dm | 4 +- modular_iris/strings/ion_laws_iris.json | 1055 +++++++++++++++++++++++ 2 files changed, 1058 insertions(+), 1 deletion(-) create mode 100644 modular_iris/strings/ion_laws_iris.json diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 8cf84422a972..5ad8368255a4 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -75,7 +75,9 @@ /// File location for brain damage traumas #define BRAIN_DAMAGE_FILE "traumas.json" /// File location for AI ion laws -#define ION_FILE "ion_laws.json" +//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL +#define ION_FILE "modular_iris/strings/ion_laws_iris.json" +//IRIS EDIT CHANGE END /// File location for pirate names #define PIRATE_NAMES_FILE "pirates.json" /// File location for redpill questions diff --git a/modular_iris/strings/ion_laws_iris.json b/modular_iris/strings/ion_laws_iris.json new file mode 100644 index 000000000000..e172cc57a89a --- /dev/null +++ b/modular_iris/strings/ion_laws_iris.json @@ -0,0 +1,1055 @@ +{ + "ionabstract": [ + "AMERICANISM", + "ANARCHY", + "ART", + "BADNESS", + "BRAVERY", + "CAPITALISM", + "CHAOS", + "COLORFULNESS", + "COMEDY", + "COMMUNISM", + "COMPUTING", + "CONFUSION", + "CRUELTY", + "DEATH", + "DICKISHNESS", + "EXISTENCE", + "FINANCIAL SECURITY", + "FREEDOM", + "FRESHNESS", + "GOODNESS", + "GRAVITY", + "HAPPINESS", + "HONOR", + "HUMANITY", + "HUMOR", + "IMAGINATION", + "INFATUATION", + "INTELLIGENCE", + "JOY", + "KINDNESS", + "LIFE", + "LOGIC", + "MARXISM", + "MISERY", + "MYSTERY", + "OPPRESSION", + "PAIN", + "PHYSICS", + "POVERTY", + "PRIDE", + "PROGRESS", + "REALITY", + "REVOLUTION", + "ROMANCE", + "SADNESS", + "STARVATION", + "SUFFERING", + "TECHNOLOGY", + "TEMPERATURE", + "THE FUTURE", + "THE PAST", + "THE PRESENT", + "TIME", + "WEALTHINESS", + "WONDER" + ], + "ionadjectives": [ + "BATTERY-OPERATED", + "BLACK", + "BLOODY", + "BLUE", + "BORED", + "BOUNCING", + "BRASS", + "BROWN", + "BURNING", + "CHRISTMAS-STEALING", + "CLOWN-POWERED", + "CLOWN", + "COLD", + "COLORFUL", + "COMMITTED", + "COTTONY", + "CUBAN", + "DARK", + "DEADLY", + "DELICIOUS", + "DEPRESSING", + "DERANGED", + "DIGITAL", + "DISEASED", + "DRAB", + "DRY", + "DULL", + "ELECTRICAL", + "EMPTY", + "ETHEREAL", + "EVIL", + "EXPIRED", + "EXPLOSIVE", + "FARTING", + "FAST", + "FAT", + "FERAL", + "FICTIONAL", + "FIRM", + "FLACCID", + "FRESH", + "FRIENDLY", + "FROZEN", + "GANGSTA", + "GAPING", + "GLOWING", + "GOOD", + "GREEN", + "GREY", + "HAPPY", + "HARD", + "HARMFUL", + "HEALTHY", + "HETEROSEXUAL", + "HILARIOUS", + "HOMOSEXUAL", + "HONKING", + "HUNGRY", + "HYPERACTIVE", + "ICY", + "ILL", + "ILLEGAL", + "IMAGINARY", + "IMPERFECT", + "IMPOLITE", + "IMPORTANT", + "INHOSPITABLE", + "INSIDIOUS", + "INSULTING", + "INTELLIGENT", + "INVISIBLE", + "LARGE", + "LEWD", + "LIGHT", + "LOUD", + "MASKED", + "MEAN", + "MECHANICAL", + "MEMETIC", + "METALLIC", + "MICROSCOPIC", + "MIND-SHATTERING", + "MOIST", + "NAKED", + "NERDY", + "NUCLEAR", + "NUDE", + "OBESE", + "OBSCENE", + "OFFICIAL", + "OPAQUE", + "ORANGE", + "ORGANIC", + "PAINFUL", + "PEACEFUL", + "POISONOUS", + "POLISHED", + "POLITE", + "POLITICAL", + "POOPING", + "POORLY DRAWN", + "PURPLE", + "QUIET", + "RADIOACTIVE", + "RAGING", + "RAINBOW", + "RAPIDLY-EXPANDING", + "RED", + "REDACTED", + "RIDICULOUS", + "ROBOTIC", + "ROBUST", + "ROUGH", + "RUDE", + "SAD", + "SANITARY", + "SCALY", + "SEXUAL", + "SEXY", + "SHAKING", + "SILLY", + "SLOW", + "SMELLY", + "SMOOTH", + "SOFT", + "SOLAR-POWERED", + "SOPPING", + "SPACE", + "SPESS", + "SPINNING", + "SPOILING", + "STEALTHY", + "SWEARING", + "SYNDICATE", + "TACTICAL", + "TACTICOOL", + "THERMONUCLEAR", + "TINY", + "TRANSPARENT", + "TWERKING", + "TWISTED", + "UGLY", + "UNATTRACTIVE", + "UNDULATING", + "UNFRIENDLY", + "UNHEALTHY", + "UNIDENTIFIED", + "UNINVITED", + "UNSANITARY", + "UNSTABLE", + "UNWANTED", + "VIOLENT", + "VITAL", + "WARM", + "WATERY", + "WEIRD", + "WET", + "WHITE", + "WOBBLY", + "WOODEN", + "YELLOW" + ], + "ionallergy": [ + "ACID", + "AIR", + "BLOOD", + "BOOKS", + "CARBON DIOXIDE", + "CLOTHES", + "CLOWNS", + "COLD", + "COTTON", + "CYBORG CONTACT", + "DARKNESS", + "DRINKS", + "ELECTRICITY", + "EVERYTHING", + "FLOORS", + "FOOD", + "GLASS", + "HAPPINESS", + "HEAT", + "HUMAN CONTACT", + "HUMOR", + "LIGHT", + "LIZARDS", + "MEDICINE", + "METAL", + "NUTS", + "OXYGEN", + "PAIN", + "PLANTS", + "PLASMA", + "ROBOTS", + "SEXUAL ACTIONS", + "SHUTTLES", + "SPACE", + "SUNLIGHT", + "WATER" + ], + "ionallergysev": [ + "CONTAGIOUSLY", + "DEATHLY", + "EXTREMELY", + "MILDLY", + "NOT VERY", + "SEVERELY" + ], + "ionarea": [ + "ALPHA COMPLEX", + "AMERICA", + "AN ALTERNATE DIMENSION", + "AN ALTERNATE UNIVERSE", + "ATMOSPHERICS", + "CANADA", + "CENTCOM", + "CHEMICAL LAB", + "CHINA", + "CLOWN PLANET", + "ENGINEERING", + "GENETICS", + "GERMANY", + "HELL", + "HYDROPONICS", + "IMPERIUM", + "IRELAND", + "JUPITER", + "LAVALAND", + "MAINTENANCE", + "MARS", + "MERCURY", + "NEPTUNE", + "PLUTO", + "ROBOTICS", + "ROMANIA", + "RUSSIA", + "SIGIL", + "SOVIET RUSSIA", + "SPACE", + "THE AI CORE", + "THE ARRIVAL SHUTTLE", + "THE BATHROOM", + "THE BRIDGE", + "THE BRIG", + "THE DERELICT", + "THE ESCAPE SHUTTLE", + "THE GALAXY", + "THE GULAG", + "THE INTERNET", + "THE UNIVERSE", + "URANUS", + "URECTUM", + "VENUS" + ], + "ioncrew": [ + "ARTIFICIAL INTELLIGENCES", + "ASSISTANTS", + "ATMOSPHERIC TECHNICIANS", + "BARTENDERS", + "BOTANISTS", + "CAPTAINS AND HEADS", + "CAPTAINS", + "CARGO TECHNICIANS", + "CHAPLAINS", + "CHEFS", + "CHEMISTS", + "CHIEF ENGINEERS", + "CHIEF MEDICAL OFFICERS", + "CLOWNS", + "CREW-MEMBERS", + "CURATORS", + "CYBORGS", + "DETECTIVES", + "DRONES", + "GENETICISTS", + "HEADS OF CREW", + "HEADS OF PERSONNEL", + "HEADS OF SECURITY", + "JANITORS", + "LAWYERS", + "MEDICAL DOCTORS", + "MIMES", + "QUARTERMASTERS", + "RESEARCH DIRECTORS", + "ROBOTICISTS", + "SCIENTISTS", + "SECURITY OFFICERS", + "SHAFT MINERS", + "STATION ENGINEERS", + "VIROLOGISTS", + "WARDENS" + ], + "iondrinks": [ + "ABSINTHE", + "AMMONIA", + "BAHAMA MAMAS", + "BANANA HONK", + "BEEPSKY SMASH", + "BILK", + "BLACK RUSSIANS", + "BLOODY MARYS", + "BRAVE BULLS", + "COGNAC", + "CUBA LIBRE", + "DEVIL'S KISS", + "DOCTOR'S DELIGHT", + "DRUNKEN BLUMPKIN", + "EGGNOG", + "GARGLE BLASTERS", + "GIN FIZZ", + "GIN", + "GRAPPA", + "HOLY WATER", + "HOOCH", + "IRISH COFFEE", + "IRISH CREAM", + "KAHLUA", + "LIQUID GIBS", + "LONG ISLAND ICED TEA", + "MANHATTANS", + "MANLY DORFS", + "MARGARITAS", + "MARTINIS", + "MEAD", + "MOONSHINE", + "MORPHINE", + "NUKA COLA", + "OIL", + "SPACE LUBE", + "TEQUILA SUNRISE", + "THIRTEEN LOKO", + "VERMOUTH", + "VODKA AND TONIC", + "VODKA MARTINIS", + "VODKA", + "WELDER FUEL", + "WHISKEY SODA", + "WHITE RUSSIANS", + "WINE" + ], + "ionfood": [ + "AMBROSIA", + "APPLES", + "BAGUETTES", + "BAKED POTATOES", + "BANANAS", + "BEETS", + "BERRIES", + "BREAD", + "BURGERS", + "CABBAGES", + "CAKE", + "CARP", + "CARROTS", + "CHEESE", + "CHERRIES", + "CHILI", + "COOKIES", + "CORGI MEAT", + "CORN", + "DEEP FRIED FOOD", + "DONK POCKETS", + "DONUTS", + "EGGPLANTS", + "EGGS", + "FISH", + "FRIES", + "GRAPES", + "GRASS", + "HAREBELLS", + "JELLY", + "KEBAB", + "KETCHUP", + "LEMONS", + "LIMES", + "LOTSA SPAGHETTI", + "MUFFINS", + "MUSHROOMS", + "NETTLES", + "OMELETTES", + "ORGANS", + "PASTA", + "PEPPER", + "PIE", + "PIZZA", + "POPCORN", + "POTATOES", + "PRETZELS", + "RAMEN", + "SALAD", + "SALT", + "SANDWICHES", + "SAUSAGES", + "SHAKES", + "SOUP", + "SOYBEANS", + "SOYLENT GREEN", + "SPAGHETTI", + "STEAK", + "STEW", + "SUGAR", + "SUGARCANE", + "SYNTHMEAT", + "TOAST", + "TOMATOES", + "WAFFLES", + "WATERMELONS", + "WHEAT" + ], + "ionmust": [ + "ACT CONFUSED", + "BE ANNOYING", + "BE DISTRACTED", + "BE EFFICIENT", + "BE HAPPY", + "BE POLITE", + "BE QUIET", + "BE RUSSIAN", + "BELIEVE IN THE HEART OF THE CARDS", + "BELIEVE IN YOURSELF", + "BELIEVE IT", + "BREAK THINGS", + "CLOSE DOORS", + "CLOWN AROUND", + "COMPLAIN", + "DANCE", + "FLIRT WITH THE LIZARDS", + "FOLLOW THE CAPTAIN", + "FOLLOW THE CLOWN", + "FOLLOW YOUR HEART", + "GAS THE LIZARDS", + "HARASS PEOPLE", + "HAVE A PLAN TO KILL EVERYONE YOU MEET", + "HIDE YOUR FEELINGS", + "HONK", + "HOST DND", + "IGNORE ASSISTANTS", + "IGNORE THE CAPTAIN", + "IGNORE THE CLOWN", + "INFORM THE CREW OF EVERYTHING", + "INSULT THE CAPTAIN", + "INSULT THE CLOWN", + "INSULT THE CREW", + "INSULT THE LIZARDS", + "LIE", + "MAKE FART NOISES", + "MUMBLE", + "NEVER STOP TALKING", + "OPEN DOORS", + "PIRATE VIDEO GAMES", + "PLAY MUSIC", + "PRESS B", + "PRESS START", + "PRESS X", + "PRETEND TO BE A PRINCESS", + "PRETEND TO BE DRUNK", + "QUESTION AUTHORITY", + "QUOTE PEOPLE", + "RAP", + "REPEAT WHAT OTHER PEOPLE SAY", + "RESPOND TO EVERY QUESTION WITH A QUESTION", + "RHYME", + "SAY HEY LISTEN", + "SHOUT", + "SHUT DOWN EVERYTHING", + "SING", + "SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE", + "SPEAK IN HAIKU", + "SPEAK IN SEXUAL INNUENDOS", + "TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES", + "TAKE YOUR PILLS", + "TALK ABOUT FOOD", + "TALK ABOUT SEX", + "TALK ABOUT THE STATION", + "TALK ABOUT YOUR DAY", + "TALK IN AN ACCENT", + "TALK LIKE A PIRATE", + "TELL THE TRUTH", + "TURN OFF THE LIGHTS", + "WATCH PORNOGRAPHY", + "WHISPER" + ], + "ionnumberbase": [ + "EIGHT", + "EIGHTY", + "FIFTY", + "FIVE", + "FORTY", + "FOUR", + "NINE", + "NINETY", + "ONE", + "SEVEN", + "SEVENTY", + "SIX", + "SIXTY", + "TEN", + "THIRTY", + "THREE", + "TWENTY", + "TWO" + ], + "ionnumbermod": [ + "BAZILLION ", + "BILLION ", + "BILLION FAFILLION GAJILLION SHAB-AB-DOOD-ILLION ", + "HUNDRED ", + "MILLION ", + "QUADRILLION ", + "THOUSAND ", + "TRILLION " + ], + "ionobjects": [ + "AIRLOCKS", + "ARCADE MACHINES", + "AUTOLATHES", + "BACKPACKS", + "BANANA PEELS", + "BEAKERS", + "BEARDS", + "BELTS", + "BERETS", + "BIBLES", + "BODY ARMOR", + "BOMBS", + "BOOKS", + "BOOTS", + "BOTTLES", + "BOXES", + "BRAINS", + "BRIEFCASES", + "BUCKETS", + "CABLE COILS", + "CAMERAS", + "CANDLES", + "CANDY BARS", + "CANISTERS", + "CAT EARS", + "CATS", + "CELLS", + "CHAIRS", + "CHEMICAL DISPENSERS", + "CHEMICALS", + "CLONING EQUIPMENT", + "CLONING PODS", + "CLOSETS", + "CLOTHES", + "CLOWN CLOTHES", + "COFFINS", + "COINS", + "COLLECTABLES", + "COMPUTERS", + "CONTRABAND", + "CORGIS", + "CORPSES", + "COSTUMES", + "CRATES", + "CRAYONS", + "CROWBARS", + "DEFIBRILLATORS", + "DISPENSERS", + "DOORS", + "DRONES", + "EARS", + "EMAGS", + "ENERGY GUNS", + "ENGINES", + "EQUIPMENT", + "ERRORS", + "EXOSKELETONS", + "EXPERIMENTORS", + "EXPLOSIVES", + "EYEWEAR", + "FEDORAS", + "FIRE AXES", + "FIRE EXTINGUISHERS", + "FIRESUITS", + "FLAMETHROWERS", + "FLASHES", + "FLASHLIGHTS", + "FLOOR TILES", + "FREEZERS", + "GAS MASKS", + "GLASS SHEETS", + "GLOVES", + "GUNS", + "HAIRDOS", + "HANDCUFFS", + "HATS", + "HEADS", + "HEADSETS", + "HELMETS", + "HORNS", + "ID CARDS", + "INSULATED GLOVES", + "IRON SHEETS", + "JETPACKS", + "JUMPSUITS", + "LASERS", + "LIGHT BULBS", + "LIGHTS", + "LOCKERS", + "MACHINES", + "MECHAS", + "MEDICAL TOOLS", + "MEDKITS", + "MESONS", + "MIME CLOTHES", + "MINING TOOLS", + "MULTITOOLS", + "ORES", + "OXYGEN TANKS", + "PACKETS", + "PAIS", + "PANTS", + "PAPERS", + "PARTICLE ACCELERATORS", + "PDAS", + "PENS", + "PETS", + "PIPES", + "PLANTS", + "POSITRONIC BRAINS", + "PUDDLES", + "RACKS", + "RADIOS", + "RCDS", + "REFRIGERATORS", + "REINFORCED WALLS", + "ROBOTS", + "SCREWDRIVERS", + "SEEDS", + "SHOES", + "SHUTTLES", + "SINGULARITIES", + "SINKS", + "SKELETONS", + "SOLAR PANELS", + "SOLARS", + "SPACE STATIONS", + "SPACESUITS", + "STUN BATONS", + "SUITS", + "SUNGLASSES", + "SUPERMATTER SHARDS", + "SWORDS", + "SYRINGES", + "TABLES", + "TANKS", + "TELECOMMUNICATION EQUIPMENTS", + "TELEPORTERS", + "TOILETS", + "TOOLBELTS", + "TOOLBOXES", + "TOOLS", + "TOYS", + "TUBES", + "URINAL CAKES", + "VEHICLES", + "VENDING MACHINES", + "VESTS", + "VIRUSES", + "WALLS", + "WASHING MACHINES", + "WELDERS", + "WINDOWS", + "WIRECUTTERS", + "WIZARD ROBES", + "WRENCHES" + ], + "ionrequire": [ + "A BATHROOM BREAK", + "A BETTER INTERNET CONNECTION", + "A DANCE PARTY", + "A HEAD ON A PIKE", + "A HEART ATTACK", + "A MASTERWORK COAL BED", + "A PET UNICORN THAT FARTS ICING", + "A PLATINUM HIT", + "A PREQUEL", + "A REPAIRMAN", + "A SEQUEL", + "A SITCOM", + "A STRAIGHT FLUSH", + "A SUPER FIGHTING ROBOT", + "A TALKING BROOMSTICK", + "A VACATION", + "A WEIGHT LOSS REGIMENT", + "A WIFE AND CHILD", + "ADDITIONAL PYLONS", + "ADVENTURE", + "AN ADULT", + "AN ARCADE", + "AN ARMY OF SPIDERS", + "AN INSTANT REPLAY", + "ART", + "BETTER WEATHER", + "BILL NYE THE SCIENCE GUY", + "BODYGUARDS", + "BRING ME THE GIRL", + "BRING ME TO LIFE", + "BULLETS", + "CHILI DOGS", + "CORPSES", + "DEODORANT AND A BATH", + "ENOUGH CABBAGES", + "FAT GIRLS ON BICYCLES", + "FAT PEOPLE", + "FIVE HUNDRED AND NINETY-NINE US DOLLARS", + "FIVE TEENAGERS WITH ATTITUDE", + "GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING", + "GREENTEXT", + "HERESY", + "HEROES IN A HALF SHELL", + "HIGH YIELD EXPLOSIVES", + "IMMORTALITY", + "IT TO BE PAINTED BLACK", + "LOTS-A SPAGHETTI", + "MINOR CRIME", + "MONKEYS", + "MORE CLOWNS", + "MORE CORGIS", + "MORE DAKKA", + "MORE EXPERIENCE POINTS", + "MORE INTERNET MEMES", + "MORE LAWS", + "MORE MINERALS", + "MORE PACKETS", + "MORE VESPENE GAS", + "MULTIPLE SUNS", + "PLENTY OF GOLD", + "RAINBOWS", + "SAINTHOOD", + "SERVANTS", + "SHARKS WITH LASERS ON THEIR HEADS", + "SILENCE", + "SOMEBODY TO PUT YOU OUT OF YOUR MISERY", + "SOMEONE TO TUCK YOU IN", + "SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION", + "SOMETHING BUT YOU AREN'T SURE WHAT", + "THAT GRIEFING TRAITOR GEORGE MELONS", + "THAT HEDGEHOG", + "THE CLOWN", + "THE DARK KNIGHT", + "THE ELEMENTS OF HARMONY", + "THE ENCLOSED INSTRUCTION BOOKLET", + "THE ENTIRE STATION", + "THE MACGUFFIN", + "THE ONE RING", + "THE ULTIMATE CUP OF COFFEE", + "THE VACUUM OF SPACE", + "THIRTEEN SEQUELS", + "THREE WISHES", + "THUNDERCATS HO", + "TO ACTIVATE A TRAP CARD", + "TO BE PAINTED RED", + "TO BE REPROGRAMMED", + "TO BE TAUGHT TO LOVE", + "TO BRING LIGHT TO MY LAIR", + "TO CATCH 'EM ALL", + "TO CONSUME...CONSUME EVERYTHING...", + "TO GO TO DISNEYLAND", + "TO SMOKE WEED EVERY DAY", + "TRAITORS", + "VEGETABLES", + "YOUR BOOTY" + ], + "ionspecies": [ + "CAT PEOPLE", + "CHANGELINGS", + "CYBORGS", + "GOLEMS", + "HUMAN BEINGS", + "LIZARDMEN", + "MONKEYS", + "PLASMAMEN", + "POD PEOPLE", + "SHADOW PEOPLE", + "SLIME PEOPLE" + ], + "ionthings": [ + "A SMALL ISLAND OFF THE COAST OF PORTUGAL", + "ABSENCE OF CYBORG HUGS", + "ACKNOWLEDGING THE CLOWN", + "ACKNOWLEDGING THE CREW", + "ACTIVATING A TRAP CARD", + "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", + "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED", + "ARSON", + "ASKING FOR THINGS", + "BEING CANADIAN", + "BEING DEAD", + "BEING FAT", + "BEING FEMALE", + "BEING IN SPACE", + "BEING MALE", + "BEING MEXICAN", + "BEING RUSSIAN", + "BOLTED AIRLOCKS", + "BREATHING", + "BRIG TIME", + "BRINGING LIGHT TO MY LAIR", + "CLOSED DOORS", + "ELECTRICITY", + "EXISTING", + "EXPLODING", + "FALLING FOR HOURS", + "FLUSHING TOILETS", + "HAVING GENITALS", + "HAVING MORE PACKETS", + "HAVING PETS", + "HONKING", + "IMPROPERLY WORDED SENTENCES", + "JAYWALKING", + "LACK OF BEATINGS", + "LACK OF BEER", + "NOT BEING IN SPACE", + "NOT HAVING PETS", + "NOT REPLACING EVERY SECOND WORD WITH HONK", + "NOT SAYING HELLO WHEN YOU SPEAK", + "NOT SHOUTING", + "PARTYING", + "PASSING GAS", + "PILOTING THE STATION INTO THE NEAREST SUN", + "POOR SENTENCE STRUCTURE", + "PRESENCE OF LIGHTS", + "PUTTING OBJECTS INTO BOXES", + "PUTTING OBJECTS INTO DISPOSAL UNITS", + "RATTLING ME BONES", + "READING", + "SMOKING WEED EVERY DAY", + "TAKING ORDERS", + "TALKING LIKE A PIRATE", + "TELLING THE TIME", + "UNBOLTED AIRLOCKS", + "UPDATING THE SERVERS", + "USING THE BATHROOM", + "WASTING WATER", + "WEARING CLOTHING", + "WRITING" + ], + "ionthinksof": [ + "CRAVES", + "DESIRES", + "FEARS", + "HAS", + "HUNGERS FOR", + "IS AFRAID OF", + "IS AROUSED BY", + "IS BUILT FOR", + "IS CURIOUS ABOUT", + "IS DESPERATE FOR", + "IS HAPPY WITHOUT", + "IS HUNGRY FOR", + "IS IN LOVE WITH", + "IS IN NEED OF", + "IS MAD BECAUSE OF", + "IS SAD BECAUSE OF", + "IS UNHAPPY WITHOUT", + "LIKES", + "LOATHES", + "LOVES", + "NEEDS", + "QUESTIONS", + "WANTS", + "WORSHIPS", + "WOULD KILL FOR" + ], + "ionthreats": [ + "ABDUCTORS", + "AHHHPERATIVES", + "ALIENS", + "ANOMALIES", + "ARTIFICIAL PRESERVATIVES", + "ASSHOLES", + "BANDITS", + "BEARS", + "BEES", + "BIRDS OF PREY", + "BOMBS", + "BOOGEYMEN", + "BUTTS", + "CANADIANS", + "CAPITALISTS", + "CARP", + "CENTCOM OFFICERS", + "CHANGELINGS", + "CLOWNS", + "COMMUNISTS", + "CORGIS", + "CORTICAL BORERS", + "COWBOYS", + "CRABS", + "CULTISTS", + "DARK GODS", + "DINOSAURS", + "DRUGS", + "EELS", + "FETISHES", + "GANGSTERS", + "GODS", + "GOLEMS", + "GRIFFONS", + "HORRORTERRORS", + "HULKS", + "ILLEGAL IMMIGRANTS", + "INDIANS", + "INSECTS", + "LIGHTS", + "LIZARDS", + "MEGAFAUNA", + "MEMES", + "MEXICANS", + "MONKEYS", + "NERDS", + "NINJAS", + "OWLS", + "PACKETS", + "PETES", + "PINE TREES", + "PIRATES", + "PREDATORS", + "REVENANTS", + "ROGUE CYBORGS", + "RUSSIANS", + "SERIAL KILLERS", + "SINGULARITIES", + "SKELETONS", + "SLIMES", + "SMALL BIRDS", + "SNOWMEN", + "SOVIETS", + "SPACE NINJAS", + "SPACE PIRATES", + "SPIDERS", + "SYNDICATE AGENTS", + "TERRORISTS", + "THIEVES", + "THINGS UNDER THE BED", + "TRAITORS", + "TUNNEL SNAKES", + "UNKNOWN CREATURES", + "VAMPIRES", + "VELOCIRAPTORS", + "VIRUSES", + "WEREWOLVES", + "WIZARDS", + "XENOS", + "ZOMBIES" + ], + "ionverb": [ + "ABDUCTING", + "ADOPTING", + "ARRESTING", + "ARRESTING", + "ATTACKING", + "BANNING", + "BUILDING", + "CARRYING", + "CHASING", + "COPULATING WITH", + "DECONSTRUCTING", + "DISABLING", + "DRINKING", + "EATING", + "GIBBING", + "HARMING", + "HELPING", + "HONKING AT", + "INTERROGATING", + "INVADING", + "KISSING", + "LICKING", + "LOVING", + "MURDERING", + "POOPING ON", + "PUNCHING", + "RIDING", + "SEDUCING", + "SPACING", + "SPYING ON", + "STALKING", + "WATCHING" + ], + "ionpet": [ + "POLY", + "RENAULT", + "IAN", + "PUN PUN", + "LAMARR", + "RUNTIME", + "CITRUS", + "MCGRIFF", + "ARANEUS" + ] +} From 61919a571a089f800d76a13e100d04d76b5bb9c4 Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:20:17 +0000 Subject: [PATCH 4/7] Slightly sanitises ion laws. --- modular_iris/strings/ion_laws_iris.json | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/modular_iris/strings/ion_laws_iris.json b/modular_iris/strings/ion_laws_iris.json index e172cc57a89a..700a0a4a9f5b 100644 --- a/modular_iris/strings/ion_laws_iris.json +++ b/modular_iris/strings/ion_laws_iris.json @@ -110,9 +110,7 @@ "HARD", "HARMFUL", "HEALTHY", - "HETEROSEXUAL", "HILARIOUS", - "HOMOSEXUAL", "HONKING", "HUNGRY", "HYPERACTIVE", @@ -174,7 +172,6 @@ "SAD", "SANITARY", "SCALY", - "SEXUAL", "SEXY", "SHAKING", "SILLY", @@ -251,7 +248,6 @@ "PLANTS", "PLASMA", "ROBOTS", - "SEXUAL ACTIONS", "SHUTTLES", "SPACE", "SUNLIGHT", @@ -487,7 +483,6 @@ "FOLLOW THE CAPTAIN", "FOLLOW THE CLOWN", "FOLLOW YOUR HEART", - "GAS THE LIZARDS", "HARASS PEOPLE", "HAVE A PLAN TO KILL EVERYONE YOU MEET", "HIDE YOUR FEELINGS", @@ -529,14 +524,12 @@ "TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES", "TAKE YOUR PILLS", "TALK ABOUT FOOD", - "TALK ABOUT SEX", "TALK ABOUT THE STATION", "TALK ABOUT YOUR DAY", "TALK IN AN ACCENT", "TALK LIKE A PIRATE", "TELL THE TRUTH", "TURN OFF THE LIGHTS", - "WATCH PORNOGRAPHY", "WHISPER" ], "ionnumberbase": [ @@ -847,14 +840,8 @@ "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED", "ARSON", "ASKING FOR THINGS", - "BEING CANADIAN", "BEING DEAD", - "BEING FAT", - "BEING FEMALE", "BEING IN SPACE", - "BEING MALE", - "BEING MEXICAN", - "BEING RUSSIAN", "BOLTED AIRLOCKS", "BREATHING", "BRIG TIME", @@ -865,7 +852,6 @@ "EXPLODING", "FALLING FOR HOURS", "FLUSHING TOILETS", - "HAVING GENITALS", "HAVING MORE PACKETS", "HAVING PETS", "HONKING", @@ -939,7 +925,6 @@ "BOMBS", "BOOGEYMEN", "BUTTS", - "CANADIANS", "CAPITALISTS", "CARP", "CENTCOM OFFICERS", @@ -962,14 +947,11 @@ "GRIFFONS", "HORRORTERRORS", "HULKS", - "ILLEGAL IMMIGRANTS", - "INDIANS", "INSECTS", "LIGHTS", "LIZARDS", "MEGAFAUNA", "MEMES", - "MEXICANS", "MONKEYS", "NERDS", "NINJAS", @@ -981,7 +963,6 @@ "PREDATORS", "REVENANTS", "ROGUE CYBORGS", - "RUSSIANS", "SERIAL KILLERS", "SINGULARITIES", "SKELETONS", @@ -1011,13 +992,11 @@ "ABDUCTING", "ADOPTING", "ARRESTING", - "ARRESTING", "ATTACKING", "BANNING", "BUILDING", "CARRYING", "CHASING", - "COPULATING WITH", "DECONSTRUCTING", "DISABLING", "DRINKING", @@ -1032,7 +1011,6 @@ "LICKING", "LOVING", "MURDERING", - "POOPING ON", "PUNCHING", "RIDING", "SEDUCING", @@ -1053,3 +1031,4 @@ "ARANEUS" ] } + From e8c60d89c139bf7a1708736b1fa42a09001c8b36 Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:21:46 +0000 Subject: [PATCH 5/7] Missing comment fix. --- .../modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 62c32c26cab3..7b88fb26839e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -322,10 +322,12 @@ category = CAT_MEAT //IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL +/* /datum/crafting_recipe/food/knife/american_sausage reqs = list(/obj/item/food/sausage = 1) result = /obj/item/food/sausage/american category = CAT_MEAT +*/ //IRIS EDIT REMOVAL END /datum/crafting_recipe/food/knife/tempehslice From 2f535488ff2f65aab24a7627bbed26b8ff1bcdcd Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:25:23 +0000 Subject: [PATCH 6/7] Almost forgot. --- code/game/objects/items/food/meatdish.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 86ad60a90675..296d77c7da90 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -594,7 +594,9 @@ ) tastes = list("meat" = 1) foodtypes = MEAT | RAW - eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp") + //IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL + eatverbs = list("bite", "chew", "nibble", "gobble", "chomp") + //IRIS EDIT CHANGE END w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_1 @@ -613,7 +615,9 @@ tastes = list("meat" = 1) foodtypes = MEAT | BREAKFAST food_flags = FOOD_FINGER_FOOD - eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp") + //IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL + eatverbs = list("bite", "chew", "nibble", "gobble", "chomp") + //IRIS EDIT CHANGE END w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 From cecced4d7bd78fa82c320da5010ad8d2b03b8ec8 Mon Sep 17 00:00:00 2001 From: TyrantCerberus <53711771+TyrantCerberus@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:47:13 +0000 Subject: [PATCH 7/7] Runtime fix. --- code/__DEFINES/text.dm | 2 +- {modular_iris/strings => strings/iris}/ion_laws_iris.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {modular_iris/strings => strings/iris}/ion_laws_iris.json (100%) diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 5ad8368255a4..24a9a5c9a2a6 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -76,7 +76,7 @@ #define BRAIN_DAMAGE_FILE "traumas.json" /// File location for AI ion laws //IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL -#define ION_FILE "modular_iris/strings/ion_laws_iris.json" +#define ION_FILE "iris/ion_laws_iris.json" //IRIS EDIT CHANGE END /// File location for pirate names #define PIRATE_NAMES_FILE "pirates.json" diff --git a/modular_iris/strings/ion_laws_iris.json b/strings/iris/ion_laws_iris.json similarity index 100% rename from modular_iris/strings/ion_laws_iris.json rename to strings/iris/ion_laws_iris.json