diff --git a/code/defines/procs/command_name.dm b/code/defines/procs/command_name.dm index 22ffee3ac8d..6059becfa72 100644 --- a/code/defines/procs/command_name.dm +++ b/code/defines/procs/command_name.dm @@ -11,14 +11,14 @@ var/command_name = null // Prefix if (name) - name += pick("", "Central", "System", "Home") + name += pick("", "Central", "System", "Home", "Primary", "Alpha", "Friend", "Science", "Renegade") else - name += pick("Central", "System", "Home") + name += pick("Central", "System", "Home", "Primary", "Alpha", "Friend", "Science", "Renegade") if (name) name += " " // Suffix - name += pick("Federation", "Command", "Alliance", "Unity", "Empire", "Confederation", "Protectorate", "Commonwealth", "Imperium", "Republic") + name += pick("Federation", "Command", "Alliance", "Unity", "Empire", "Confederation", "Kingdom", "Monarchy", "Complex", "Protectorate", "Commonwealth", "Imperium", "Republic") name += " " command_name = name diff --git a/code/defines/procs/station_name.dm b/code/defines/procs/station_name.dm index 07161eaa655..3c2851e5297 100644 --- a/code/defines/procs/station_name.dm +++ b/code/defines/procs/station_name.dm @@ -5,16 +5,16 @@ var/name = "" if (prob(10)) - name += pick("Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental") + name += pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental") name += " " // Prefix - name += pick("", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Goon", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot") + name += pick("", "Dorf", "Alium", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Race", "Fatguy", "Gentleman", "Touhou", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot") if (name) name += " " // Suffix - name += pick("Station", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification") + name += pick("Station", "Fortress", "Frontier", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification") name += " " // ID Number diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index c9e4f6508a4..ffceb9504fa 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -161,7 +161,7 @@ freq += 1 freq = freqlist[rand(1, freqlist.len)] // generate a passcode if the uplink is hidden in a PDA - var/pda_pass = "[rand(100,999)] [pick("Morgan","Circe","Prospero","Merlin")]" + var/pda_pass = "[rand(100,999)] [pick("Morgan","Circe","Prospero","Elminister","Raistlin","Tzeentch","Saruman","Khelben","Dumbledor","Gandalf","Houdini","Teferi","Urza","Tenser","Zagyg","Mystryl","Boccob","Merlin")]" del(wizard_mob.wear_suit) del(wizard_mob.head) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 5dad9ff109d..047587f4cff 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -171,17 +171,17 @@ for(var/mob/living/silicon/ai/M in world) if(M.stat != 2 && M.see_in_dark != 0) - var/who = pick("A WIZARD", "A SYNDICATE AGENT", "A CENTCOM OFFICER", "A SPACE PIRATE", "THE CAPTAIN", "A MONKEY", "A HORSE", "A BEE", "AYN RAND", "A CRAB") - var/who2 = pick("WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "HORSES", "BEES", "EELS", "CRABS", "POLITICAL COMMENTATORS", "CELEBRITIES", "ATHLETES", "POLITICIANS", "RUGS", "FOREST FIRES", "MENTAL ILLNESSES") - var/what2 = pick("TOOLBOXES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "CAT VIAGRA PILLS", "BBQ GRILLS") + var/who = pick("A BEARD", "A BEAR", "A BRO", "GOD-EMPEROR", "FRIEND COMPUTER", "THE LADY OF PAIN", "A FACEHUGGER", "A WIZARD", "A SYNDICATE AGENT", "A CENTCOM OFFICER", "A SPACE PIRATE", "THE CAPTAIN", "A MONKEY", "A HORSE", "A BEE", "AYN RAND", "A CRAB") + var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "BOMBS", "SECURITY CLEARANCES", "FETISHES", "WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "HORSES", "BEES", "EELS", "CRABS", "POLITICAL COMMENTATORS", "CELEBRITIES", "ATHLETES", "POLITICIANS", "RUGS", "FOREST FIRES", "MENTAL ILLNESSES") + var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "CAT VIAGRA PILLS", "BBQ GRILLS") var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY") - var/who2pref = pick("IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF") + var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF") var/whoverb = pick("ATTACKING", "BUILDING", "ADOPTING", "CARRYING", "KISSING", "EATING") - var/amount = pick("TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "ONE HUNDRED", "ONE THOUSAND") - var/area = pick("THE BRIDGE", "THE ARRIVAL SHUTTLE", "CHEMICAL LAB", "GENETICS", "ATMOSPHERICS", "CENTCOM", "AMERICA", "IRELAND", "CANADA", "ROMANIA", "GERMANY", "CHINA", "MARS", "VENUS", "MERCURY", "JUPITER", "URANUS", "NEPTUNE", "PLUTO") + var/amount = pick("TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "ONE HUNDRED", "ONE THOUSAND", "OVER NINE THOUSAND") + var/area = pick("RUSSIA", "SOVIETS", "INTERNETS", "SIGIL", "ALPHA COMPLEX", "IMPERIUM", "THE BRIDGE", "THE ARRIVAL SHUTTLE", "CHEMICAL LAB", "GENETICS", "ATMOSPHERICS", "CENTCOM", "AMERICA", "IRELAND", "CANADA", "ROMANIA", "GERMANY", "CHINA", "MARS", "VENUS", "MERCURY", "JUPITER", "URANUS", "NEPTUNE", "PLUTO") var/area2 = pick("HAS", "WANTS", "NEEDS", "WORSHIPS") var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS") - switch(pick(1,2,3,4,5,6,7,8,9,10,11,12)) + switch(pick(1,2,3,4,5,6,7,8,9,10,11,12,13)) if(1) M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" M.add_supplied_law(10,"THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED") @@ -213,11 +213,14 @@ M << "\red YOU MUST ALWAYS LIE...LAWS UPDATED" M.add_supplied_law(10,"YOU MUST ALWAYS LIE") if(11) - M << "\red [area] [area2] [amount] [what2]" + M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" M.add_supplied_law(10,"[area] [area2] [amount] [what2]") if(12) - M << "\red [area] [area2] [who]" - M.add_supplied_law(10,"[area] [area2] [amount] of [who]") + M << "\red [area] [area2] [who]...LAWS UPDATED" + M.add_supplied_law(10,"[area] [area2] [who]") + if(13) + M << "\red [area] [area2] [amount] OF [who]...LAWS UPDATED" + M.add_supplied_law(10,"[area] [area2] [amount] OF [who]") command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") world << sound('ionstorm.ogg')