diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index fbbd4f20e0e..f50dbe44e2d 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -167,12 +167,20 @@ /datum/accent/jupiter name = ACCENT_JUPITER - description = "The Jovian accent is an odd mish-mash of accents from Jupiter's various moons, and has heavy variation on each of the moons. On Idris Incorporated-dominated Europa, \ - the Jovian accent often takes on traces of Tradeband due to the amount of high-income tourism, while the Castillean Jovian accent is known for the rapid, breathless pace at which it \ - is typically spoken. Ganymede is often seen as the \"standard\" Jovian accent, though some on Castillo vehemently believe that the Castillian accent should be the standard." + description = "The Jovian accent is an odd mish-mash of accents from Jupiter's various moons, and has heavy variation on each of the moons. On Europa, the Jovian accent often takes on traces of \ + Tradeband due to the amount of high-income tourism, while the Callistean Jovian accent is known for the rapid, breathless pace at which it is typically spoken. Ganymede is often seen as the standard \ + Jovian accent, though some on Castillo vehemently believe that the Callistean accent should be considered the standard." tag_icon = "jupiter" text_tag = "JUP" +/datum/accent/callisto + name = ACCENT_CALLISTO + description = "Considered to be one of the most recognizable accents in the Sol System due to its uniquely breathless pace, the stereotypical Callistean accent has its roots in the moon's \ + port district of New Valletta. While not all Callisteans speak with the breathless pace of those from New Valletta, the district's status as a port has led to its accent becoming the moon's most \ + recognized one. As a whole the Callistean accent can be easily recognized by its fast pace of speaking and seeking disregard for pauses." + tag_icon = "callisto" + text_tag = "CAL" + /datum/accent/europa name = ACCENT_EUROPA description = "Europans are known to be much quieter and speak at a slower pace than their counterparts on Callisto, despite the close proximity of the two moons. Solarian linguists have \ diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index e701d8feb04..ae2954bee62 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -84,6 +84,7 @@ #define ACCENT_DOMINIA_HIGH "High Morozi" #define ACCENT_DOMINIA_VULGAR "Vulgar Morozi" #define ACCENT_JUPITER "Jovian" +#define ACCENT_CALLISTO "Callistean" #define ACCENT_EUROPA "Europan" #define ACCENT_EARTH "Earther" #define ACCENT_NCF "Non-Coalition Frontier" @@ -146,6 +147,6 @@ #define ACCENT_CTHUR "C'thuric" #define ACCENT_LIIDRA "Lii'draic" -#define ACCENTS_ALL_IPC_SOL list(ACCENT_SOL, ACCENT_JUPITER, 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_JUPITER, 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_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) +#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_CALLISTO, 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_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_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, 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/human/sol.dm b/code/modules/background/origins/origins/human/sol.dm index 16f3544bbca..b1932ce212a 100644 --- a/code/modules/background/origins/origins/human/sol.dm +++ b/code/modules/background/origins/origins/human/sol.dm @@ -9,7 +9,7 @@ /decl/origin_item/origin/earth, /decl/origin_item/origin/luna, /decl/origin_item/origin/venus, - /decl/origin_item/origin/mars, + /decl/origin_item/origin/mars, /decl/origin_item/origin/jupiter, /decl/origin_item/origin/pluto, /decl/origin_item/origin/eridani, @@ -61,7 +61,7 @@ /decl/origin_item/origin/jupiter name = "Jupiter" desc = "The three major inhabited moons of Jupiter - Callisto, Ganymede, and Europa - are key Solarian worlds. Callisto serves as a major port for the Alliance, Ganymede produces much of the food the Alliance consumes, and Europa is a major research hub. The Jovian Moons are home to a remarkable diversity of humanity, and humans from almost anywhere in the Orion Spur can be found in their ports." - possible_accents = list(ACCENT_JUPITER, ACCENT_EUROPA) + possible_accents = list(ACCENT_JUPITER, ACCENT_EUROPA, ACCENT_CALLISTO) possible_citizenships = CITIZENSHIPS_SOLARIAN possible_religions = RELIGIONS_SOLARIAN diff --git a/code/modules/background/origins/origins/ipc/megacorporate.dm b/code/modules/background/origins/origins/ipc/megacorporate.dm index 02445610317..f9a76fcbc30 100644 --- a/code/modules/background/origins/origins/ipc/megacorporate.dm +++ b/code/modules/background/origins/origins/ipc/megacorporate.dm @@ -13,7 +13,7 @@ name = "Idris Incorporated" 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_JUPITER, ACCENT_ERIDANI, ACCENT_LUNA, ACCENT_EARTH, ACCENT_VENUS, ACCENT_CETI, ACCENT_TTS) + possible_accents = list(ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SOL, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_ERIDANI, ACCENT_LUNA, ACCENT_EARTH, ACCENT_VENUS, ACCENT_CETI, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) @@ -41,8 +41,8 @@ possible_religions = list(RELIGION_NONE) /decl/origin_item/origin/nanotrasen - name = "NanoTrasen" - desc = "NanoTrasen, in keeping close ties with the Biesellite government, quietly and eagerly accepted IPCs into its workforce while carefully manipulating the books to ensure that very few would ever attain freedom. IPCs are a common but not ubiquitous sight on NanoTrasen installations and can be found working any number of roles. Although the company's treatment of IPCs is styled after Biesel's own attitude towards synthetics, it can vary wildly depending on where a positronic works and who exactly it works under." - possible_accents = list(ACCENT_CETI, 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_PLUTO, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN) + name = "Nanotrasen" + desc = "Nanotrasen, in keeping close ties with the Biesellite government, quietly and eagerly accepted IPCs into its workforce while carefully manipulating the books to ensure that very few would ever attain freedom. IPCs are a common but not ubiquitous sight on NanoTrasen installations and can be found working any number of roles. Although the company's treatment of IPCs is styled after Biesel's own attitude towards synthetics, it can vary wildly depending on where a positronic works and who exactly it works under." + possible_accents = list(ACCENT_CETI, 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_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_FISANDUH, ACCENT_PLUTO, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index e1b37443bae..9bf195c4a8f 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -54,7 +54,7 @@ var/obj/item/card/id/id_card var/id_card_type = /obj/item/card/id/synthetic - var/list/possible_accents = list(ACCENT_TTS, ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_LUNA, ACCENT_MARTIAN, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, + var/list/possible_accents = list(ACCENT_TTS, ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_LUNA, ACCENT_MARTIAN, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_KONYAN, ACCENT_EARTH, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_AEMAQ, ACCENT_NEWSUEZ, ACCENT_DAMASCUS, ACCENT_ERIDANI, ACCENT_PHONG, ACCENT_VISEGRAD, ACCENT_HIMEO, ACCENT_PLUTO) diff --git a/html/changelogs/stryker-callistoaccent.yml b/html/changelogs/stryker-callistoaccent.yml new file mode 100644 index 00000000000..d5ba1926d73 --- /dev/null +++ b/html/changelogs/stryker-callistoaccent.yml @@ -0,0 +1,42 @@ +################################ +# 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: The Stryker, NewOriginalSchwann + +# 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: + - rscadd: "Adds a Callisto accent, available for any species/origin that could take the Jovian accent." + - tweak: "Tweaks the Jovian accent description." \ No newline at end of file diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index c6a89a9bd46..33194e8bf69 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ