From 4d35335be9b9457c555f2efcc5023fdc886a9420 Mon Sep 17 00:00:00 2001 From: juniper <70682905+crunchypretzels@users.noreply.github.com> Date: Wed, 27 Apr 2022 12:00:42 -0400 Subject: [PATCH] Readds TTS to all IPC origins as an accent (#13681) --- code/modules/background/defines.dm | 2 +- .../origins/origins/ipc/coalition.dm | 6 +-- .../background/origins/origins/ipc/elyra.dm | 2 +- .../origins/origins/ipc/megacorporate.dm | 8 ++-- .../background/origins/origins/ipc/sol.dm | 4 +- html/changelogs/waffai-ttsfixes.yml | 41 +++++++++++++++++++ 6 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/waffai-ttsfixes.yml diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 7ee0706fd02..ed9419a3ed1 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -144,6 +144,6 @@ #define ACCENT_CTHUR "C'thuric" #define ACCENT_LIIDRA "Lii'draic" -#define ACCENTS_ALL_IPC_SOL list(ACCENT_SOL, ACCENT_EARTH, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_MARTIAN, ACCENT_JUPITER, ACCENT_EUROPA, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_PLUTO, ACCENT_MICTLAN, ACCENT_KONYAN, ACCENT_LUNA) +#define ACCENTS_ALL_IPC_SOL list(ACCENT_SOL, ACCENT_EARTH, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_MARTIAN, ACCENT_JUPITER, ACCENT_EUROPA, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_PLUTO, ACCENT_MICTLAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_TTS) #define ACCENTS_ALL_IPC list(ACCENT_CETI, ACCENT_TTS, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SCARAB, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_FISANDUH, ACCENT_GADPATHUR, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) #define RELIGIONS_ALL_IPC list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_OTHER, RELIGION_TRINARY, RELIGION_SCARAB, RELIGION_LUCEISM, RELIGION_SHINTO) \ No newline at end of file diff --git a/code/modules/background/origins/origins/ipc/coalition.dm b/code/modules/background/origins/origins/ipc/coalition.dm index a3f28c6d1f8..ad80a275855 100644 --- a/code/modules/background/origins/origins/ipc/coalition.dm +++ b/code/modules/background/origins/origins/ipc/coalition.dm @@ -10,14 +10,14 @@ /decl/origin_item/origin/ipc_xanu name = "Xanu Prime" desc = "Considered the most advanced planet in the Coalition in terms of technology and infrastructure, Xanu Prime is the natural choice for many IPC living or escaping into the Frontier. The planet hosts a population of both free and owned synthetics, offering opportunities for work and citizenship as well as danger for refugees." - possible_accents = list(ACCENT_COC) + possible_accents = list(ACCENT_COC, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE) possible_religions = RELIGIONS_ALL_IPC /decl/origin_item/origin/ipc_himeo name = "United Syndicates of Himeo" desc = "The mining colony of Himeo hosts a sizable number of IPC, most of whom toil in the industrial and excavation centres. Free units find Himeo relatively comfortable, the absence of megacorporations and communal spirit offering safety." - possible_accents = list(ACCENT_HIMEO) + possible_accents = list(ACCENT_HIMEO, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE) possible_religions = RELIGIONS_ALL_IPC @@ -25,7 +25,7 @@ name = "Republic of Assunzione" desc = "Both free and owned IPCs are common in Assunzione owing to the presence of both Zeng-Hu Pharmaceuticals and Hephaestus Industries. IPCs manufactured locally are programmed with knowledge of Luceism and even have their frames and positronics blessed by the local clergy. Their treatment varies heavily on the individual, with some viewing them as well-suited to the harsh conditions of the planet and well-integrated in its society, while others view them as a drain to the energy-starved planet. Most imported IPC either serve on expedition crews or as workers for the megacorporations while local IPCs can expect to work anywhere their human counterparts might." important_information = " All types of IPC can hail from Assunzione, although local production is primarily focused on Bishop and Mobility frames. Synthetics from the planet are programmed with knowledge of Luceism and are expected to know basic information about the faith." - possible_accents = list(ACCENT_ASSUNZIONE) + possible_accents = list(ACCENT_ASSUNZIONE, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE) possible_religions = list(RELIGION_LUCEISM, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/ipc/elyra.dm b/code/modules/background/origins/origins/ipc/elyra.dm index af862f104fc..7dc80d6db67 100644 --- a/code/modules/background/origins/origins/ipc/elyra.dm +++ b/code/modules/background/origins/origins/ipc/elyra.dm @@ -9,6 +9,6 @@ name = "Elyran" desc = "Elyra granting citizenship to a large number of IPC was, at its base, a purely political and eventually unpopular move. Since then, citizenship has proven difficult to obtain for many synthetics, the majority remaining owned privately or by a corporation. A largely isolationist Elyran society has managed to infuse its cultural identity into the majority of free IPC, though there are those who choose to abstain from the mainstream and politics to turn to the arts." important_information = "All IPC in Elyra are produced within the Republic, foreign IPC being mistrusted and oftentimes prohibited from entry, let alone citizenship and residency. All Elyran manufactured IPC are expected to have at least a basic knowledge of the cultural norms of Elyra and tenets of Islam." - possible_accents = list(ACCENT_ELYRA, ACCENT_AEMAQ, ACCENT_MEDINA, ACCENT_DAMASCUS, ACCENT_NEWSUEZ, ACCENT_PERSEPOLIS) + possible_accents = list(ACCENT_ELYRA, ACCENT_AEMAQ, ACCENT_MEDINA, ACCENT_DAMASCUS, ACCENT_NEWSUEZ, ACCENT_PERSEPOLIS, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_ELYRA, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_NONE) possible_religions = list(RELIGION_ISLAM, RELIGION_TRINARY, RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/background/origins/origins/ipc/megacorporate.dm b/code/modules/background/origins/origins/ipc/megacorporate.dm index 96cd1e245b2..6afbfefbfd7 100644 --- a/code/modules/background/origins/origins/ipc/megacorporate.dm +++ b/code/modules/background/origins/origins/ipc/megacorporate.dm @@ -13,14 +13,14 @@ name = "Idris Incorporate" desc = "Idris Incorporated is renowned across the Spur for its top of the line service, security, and investigative IPCs. Positronics working for the company are given little autonomy and closely monitored to ensure maximum efficiency and stellar customer service. Although the company likes to advertise its award-winning service IPCs, just as infamous are its Idris Reclamation Units: synthetics who will stop at nothing to ensure that the bank is given its dues." important_information = "Idris IPCs working in security are given the prefix ISU or IRU depending on their responsibilities while those working in other fields are not obliged to take one. They are barred from seeking freedom by the company and cannot be sold without having their proprietary programming wiped." - possible_accents = list(ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SOL, ACCENT_ERIDANI, ACCENT_LUNA, ACCENT_EARTH, ACCENT_VENUS, ACCENT_CETI) + possible_accents = list(ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SOL, ACCENT_ERIDANI, ACCENT_LUNA, ACCENT_EARTH, ACCENT_VENUS, ACCENT_CETI, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) /decl/origin_item/origin/hephaestus name = "Hephaestus Industries" desc = "Hephaestus Industries is known as the primary fabricator of IPCs in the Spur. Its own lines however focus mainly on strength and mining, the company fielding untold numbers of industrial frames for all sorts of excavation, cargo, and engineering operations, gaining them a sturdy reputation of durability and efficiency. The company is known to treat its IPCs fairly, albeit holding them to a higher standard than organics, and even offers synthetics who manage to purchase their freedom respectable positions within the company." - possible_accents = list(ACCENT_SOL, ACCENT_EARTH, ACCENT_MARTIAN, ACCENT_CETI, ACCENT_COC, ACCENT_NCF, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_VALKYRIE, ACCENT_GIBSON) + possible_accents = list(ACCENT_SOL, ACCENT_EARTH, ACCENT_MARTIAN, ACCENT_CETI, ACCENT_COC, ACCENT_NCF, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_VALKYRIE, ACCENT_GIBSON, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) @@ -28,7 +28,7 @@ name = "Zeng-Hu Pharmaceuticals" desc = "Zeng-Hu Pharmaceuticals employs a large number of IPCs, both free and owned, with the newest models often being shown to the public as a display of the company's technological prowess. They are treated relatively well based on the standards of the Spur, however they are often urged to perfectionism and quality, being rewarded for success and punished for failure. In keeping with the company's competitive yet meritocratic nature, IPCs which perform well and catch the eye of their superiors can be elevated to positions of responsibility, in some cases, winning their freedom through hard and exceptional labour." important_information = "IPCs belonging to Zeng-Hu do not possess a standard naming convention." - possible_accents = list(ACCENT_SOL, ACCENT_LUNA, ACCENT_CETI, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_ERIDANI) + possible_accents = list(ACCENT_SOL, ACCENT_LUNA, ACCENT_CETI, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_ERIDANI, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) @@ -36,7 +36,7 @@ name = "Zavodskoi Interstellar" //here lies necropolis, died a slow and painful death, thanks god desc = "Zavodskoi Interstellar fields a multitude of IPCs oriented towards combat and security solutions. From Industrials to Shells, these units are regularly leased out to third parties as security guards, representing the company in a professional and clean manner. Standards are high for Zavodskoi synthetics, with regular mind wiping and retooling in order to enforce discipline and minimise deviancy." important_information = "Units from Zavodskoi Interstellar are all given the prefix Z.I. in front of their name." - possible_accents = list(ACCENT_SOL, ACCENT_LUNA, ACCENT_EARTH, ACCENT_PLUTO, ACCENT_CETI) + possible_accents = list(ACCENT_SOL, ACCENT_LUNA, ACCENT_EARTH, ACCENT_PLUTO, ACCENT_CETI, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) diff --git a/code/modules/background/origins/origins/ipc/sol.dm b/code/modules/background/origins/origins/ipc/sol.dm index a59648c1ce7..b904acd3755 100644 --- a/code/modules/background/origins/origins/ipc/sol.dm +++ b/code/modules/background/origins/origins/ipc/sol.dm @@ -19,7 +19,7 @@ name = "Epsilon Eridani" desc = "Although IPCs are kept in strict servitude across the Sol Alliance, Epsilon Eridani's plutocracy allows for all rules to be rewritten, for a price. Not free on paper, synthetics that manage to rise by their cunning, guile, and savvy on that planet can escape the fate of becoming a scrapper by purchasing themselves through the guise of a startup. Despite not technically being free, few suits bother to notice the difference between an IPC and an organic with money." important_information = "This loophole is only recognized on Eridani and nations that acknowledge equal rights for IPCs. It is unlikely that an IPC with this culture can freely move around the Sol Alliance, regardless of their de-facto self-ownership." - possible_accents = list(ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED) + possible_accents = list(ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL) possible_religions = RELIGIONS_SOLARIAN @@ -27,7 +27,7 @@ name = "Konyang" desc = "The birthplace of the positronic brain, Konyang has embraced IPC as equals, integrating them into a mixed society of synthetics and humans. Ownership of IPC is forbidden, leaving them able to freely develop and express themselves as citizens with full rights and access to all levels of society. Synthetics native to Konyang tend to strongly adhere to local cultural standards, assuming the same protective attitude towards strangers like their human counterparts." important_information = "Naming conventions are relaxed on Konyang, with some IPC taking a clearly synthetic name, while others adopt names similar to humans, with both a first and surname." - possible_accents = list(ACCENT_KONYAN) + possible_accents = list(ACCENT_KONYAN, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE, RELIGION_TRINARY, RELIGION_BUDDHISM, RELIGION_SHINTO, RELIGION_TAOISM) diff --git a/html/changelogs/waffai-ttsfixes.yml b/html/changelogs/waffai-ttsfixes.yml new file mode 100644 index 00000000000..4aa3e0ef63c --- /dev/null +++ b/html/changelogs/waffai-ttsfixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: waffai + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Re-adds TTS as an accent option to all IPC origins."