diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index fdd71162caa..fa14511684e 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -766,9 +766,9 @@ var/permitted = !G.allowed_roles || (job.title in G.allowed_roles) permitted = permitted && G.check_species_whitelist(H) permitted = permitted && (!G.faction || (G.faction == H.employer_faction)) - var/decl/origin_item/culture/our_culture = decls_repository.get_decl(text2path(prefs.culture)) + var/our_culture = text2path(prefs.culture) permitted = permitted && (!G.culture_restriction || (our_culture in G.culture_restriction)) - var/decl/origin_item/origin/our_origin = decls_repository.get_decl(text2path(prefs.origin)) + var/our_origin = text2path(prefs.origin) permitted = permitted && (!G.origin_restriction || (our_origin in G.origin_restriction)) if(!permitted) diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 2deec0496ee..7ee0706fd02 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -145,5 +145,5 @@ #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 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_GADPATHUR, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) +#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/megacorporate.dm b/code/modules/background/origins/origins/ipc/megacorporate.dm index 1a2deaeee3f..96cd1e245b2 100644 --- a/code/modules/background/origins/origins/ipc/megacorporate.dm +++ b/code/modules/background/origins/origins/ipc/megacorporate.dm @@ -1,6 +1,6 @@ /decl/origin_item/culture/megacorporate name = "Megacorporate" - desc = "Scrappers, gangs of decommissioned IPCs that manage to rise and escape from the junkyards while successfully avoiding human contact in an effort to remain free, are common across Biesel, Mars and Eridani. Although little exists to unify these disparate groups as a culture, they often exhibit common characteristics such as loyalty to their gang, a distrust of organic life, and the willingness to modify their own chassis with anything it takes to survive. With the Sol Alliance losing parts of its territory, more and more Scrappers are making themselves known, taking the risk to reintegrate into a more accepting society." + desc = "The majority of IPC are manufactured by a megacorporation and nearly every type of commercially-available frame is owned or originated from them. Although many of these IPC are sold to consumers in the public and private sectors, a good portion of them are retained for in-house use by their manufacturers or their subsidiaries. The treatment and behaviour of a corporate IPC is often influenced by the megacorporation they find themselves in." possible_origins = list( /decl/origin_item/origin/idris, /decl/origin_item/origin/hephaestus, diff --git a/code/modules/background/origins/origins/ipc/tau_ceti.dm b/code/modules/background/origins/origins/ipc/tau_ceti.dm index 337b33cb2e0..505fa8b379c 100644 --- a/code/modules/background/origins/origins/ipc/tau_ceti.dm +++ b/code/modules/background/origins/origins/ipc/tau_ceti.dm @@ -1,3 +1,5 @@ + + /decl/origin_item/culture/ipc_tau_ceti name = "Tau Ceti" desc = "Tau Ceti serves as a hotbed for IPC and synthetics in general, with their treatment and status being a contentious issue within the Republic. On average, IPC within the system are programmed or exposed to influences that place value on their status as individuals and encourage them to seek freedom and citizenship in life. This focus on freedom is however carefully tailored by megacorporate influence, with many synthetics being directly owned or in indentured servitude." @@ -8,6 +10,6 @@ /decl/origin_item/origin/ipc_tau_ceti name = "Tau Ceti" desc = "IPC have had a strong presence on Biesel, a place viewed by many as a beacon of hope and freedom for all species. IPC have been granted rights to self ownership and even citizenship, complete with property and a bid in the corporate job market. However, a great number remain in impoverished conditions in the slums of District 14 of Mendell City, while the majority of synthetics are still owned under conditions similar to those of the Alliance. New Gibson similarly hosts a number of IPC as a point of entry into the wider Tau Ceti system and the Republic at large. While the cold weather may provide for a comfortable stay, the negative attitude of the human population towards synthetics has forced many to adopt a more closed and stoic outlook, tending to keep to themselves." - possible_accents = ACCENTS_ALL_IPC_SOL + possible_accents = ACCENTS_ALL_IPC possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_NONE) possible_religions = RELIGIONS_ALL_IPC \ No newline at end of file diff --git a/code/modules/client/preference_setup/origin/origin.dm b/code/modules/client/preference_setup/origin/origin.dm index e9c1e307f46..4bb7e09b574 100644 --- a/code/modules/client/preference_setup/origin/origin.dm +++ b/code/modules/client/preference_setup/origin/origin.dm @@ -100,10 +100,10 @@ var/decl/origin_item/culture/CL = decls_repository.get_decl(text2path(pref.culture)) var/decl/origin_item/origin/OR = decls_repository.get_decl(text2path(pref.origin)) dat += "Culture: [CL.name]
" - dat += "- [CL.desc]
" + dat += "- [CL.desc]" if(CL.important_information) dat += "
- [CL.important_information]" - dat += "Origin: [OR.name]
" + dat += "
Origin: [OR.name]
" dat += "- [OR.desc]" if(OR.important_information) dat += "
- [OR.important_information]" diff --git a/html/changelogs/mattatlas-originsfixes.yml b/html/changelogs/mattatlas-originsfixes.yml new file mode 100644 index 00000000000..b75680e96b3 --- /dev/null +++ b/html/changelogs/mattatlas-originsfixes.yml @@ -0,0 +1,44 @@ +################################ +# 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: MattAtlas + +# 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: "Fixed erroneous HTML code if you selected a culture with important information." + - bugfix: "Fixed the Megacorporate IPC culture desc." + - bugfix: "Fixed the absence of BSL and TTS accent on Biesel IPCs." + - bugfix: "Origin and culture restrictions for loadout items now work properly."