Approved by lore (Schwann, Sammy).
changes:
- refactor: "Splits the Jupiter origin into three: ('Jupiter', 'Jupiter,
Callisto', 'Jupiter, Europa')."
- balance: "Characters with the Europa origin gain the Cold Resistance
and Light Sensitivity traits."
- balance: "Characters with the New Gibson origin gain the Cold
Resistance trait."
---------
Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
changes:
- rscadd: "Adds additional configuration data to the Light's Edge
sector."
- soundadd: "Adds a Welcome AI voiceline for the Light's Edge sector."
- imageadd: "Adds Light's Edge sector skybox."
- imageadd: "Adds Light's Edge sector state to the Stargazer."
- balance: "Slightly decreases default light brightness, slightly
increases night mode light range."
(Light changes before and after for reference. It's a weird inclusion
for a sector PR, but I found the lights on the Horizon were washing out
the starlight, and after I stopped trying to modify starlight and
instead modified the actual light machinery, I found that the values I
landed on actually looked really nice across the ship and offsites
tested.)
Before
<img width="1346" height="1342" alt="before"
src="https://github.com/user-attachments/assets/f3d1389f-26bd-4649-a5fd-049fbee8358b"
/>
After
<img width="1347" height="1341" alt="after"
src="https://github.com/user-attachments/assets/d3109ba7-4603-47c5-83f6-5b3caa136d76"
/>
This allows Little Adhomai tajara to take Biesel citizenship, and gives
them some heat resistance to represent them being more used to warmer
climates then Adhomai.
All tajara ethnicities are able to be Biesel consulars.
For the upcoming Tajara ethnicity overhaul.
Zhan-Khazan can now be Operations Managers and Chief Engineers. M'sai
can now be Executive Officers.
Putting this up now for code review purposes. Full retcon will be
announced soon (and then this can be merged).
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.
---------
Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
V2 of [previous music playing
PR](https://github.com/Aurorastation/Aurora.3/pull/21466). TLDR no
longer uses the connect_range component for implementation because it
turned out a bit too inflexible for overlapping music players.
Removes a NanoUI template for the [TGUI
update](https://github.com/Aurorastation/Aurora.3/pull/21046).
New changelog:
- refactor: "Ported Jukebox's NanoUI interface to TGUI."
- refactor: "Ported Jukebox audio playing functionality to a component."
- refactor: "Sound keys refactored from singletons to datums, along with
larger breakout of sound.dm to allow for easier SFX updates in future."
- code_imp: "Expanded track datums to include track lengths."
- code_imp: "Reorganized music file folders for more intuitive access."
- rscadd: "Earphone status feedback text now includes track length."
- rscadd: "Added autoplay functionality to earphones."
- bugfix: "Fixed earphones' 'Previous Song' verb not sending you to the
end of the playlist when used while the first track is selected."
- bugfix: "Fixed gain adjustment for 'Konyang-1' (-23 dB -> standard
-9.8 dB)."
- bugfix: "Fixed y-offset of audioconsole-running overlay animation to
line up with the actual screen."
---------
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
I don't know what more can I say that the title of the PR didn't.
_Hopefully_ this will inspire someone to play Tajaran consulars more.
From the changelog:
> - imageadd: "Resprited all Tajaran consular clothing."
> - rscadd: "Added a female version of the NKA consular uniform."
> - rscadd: "Added Tajaran consular coats."
> - rscadd: "Added extended descriptions to all Tajaran consular
clothing items."
> - rscdel: "Removed Tajaran consular side caps."
Images, as always, in the details below.
Old (current) sprites on the top, new on the bottom unless stated
otherwise.
<details>
<summary>Things resprited in this PR: </summary>
<details>
<summary>Consular uniforms and hats: </summary>
<img width="1536" height="1024" alt="officering my consular"
src="https://github.com/user-attachments/assets/90cc5ce0-ded8-4ee8-80fc-a459e4b2965f"
/>
Maybe some uniqueness has been lost, but I'm sure the large playerbase
of Tajaran consulars will be able to cope with it.
</details>
<details>
<summary>New consular coats, closed and open variants: </summary>
<img width="1536" height="1024" alt="closed by default"
src="https://github.com/user-attachments/assets/81480c66-e350-4f41-9110-194805299cfd"
/>
</details>
</details>
Short attribution section because it would feel disingenuous without it,
the NKA consular coat _has_ been inspired by sprites from this PR from
Shiptest: https://github.com/shiptest-ss13/Shiptest/pull/2685
And, of course,
Hadii's grace, comrades.
This does a few times, after the scope got bigger than I originally
planned:
- Watches now have an action button top left to check time.
- Taj time checking code was moved over to the time helper file to not
be watch exclusive.
- The taj wrist watches now shows the time on adhomai.
- Papercode now has the ability to show taj time and date, and to insert
the credit symbol.
Reverts #20467
For some reason, if you put a png into icon() and then show that to a
client, it uses a colossal amount of GPU. No idea.
Reverts to our older lobby system pending TGUI update.
Fixes#21489
- Adds cargo price coefficent for all suppliers with help from lore (for
most it is +20% if non-megacorp, -20% if megacorp)
- Refactors Xanu to be child of Liberty's Cradle, this should be what is
done for the other major systems in the region
- Removes port of call days for liberty's cradle
---------
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
With https://github.com/Aurorastation/Aurora.3/pull/20956 implemented
and a review of cargo pricing, lore believes that the current settings
for Crescent Expanse (price *200!) is too high, and significantly
brought it down
The goal with the changes is allow cheaper goods to still be
purchasable, but more specialized equipment (positronic + SM crystal for
example) like requiring delving into department accounts
---------
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Removes the apostrophes from the flavour text by slightly tweaking the
wording, since they throw up an unpleasant looking error.
---------
Signed-off-by: Fyni <itsfyni@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Adds the Zhurong accent, available to Dominian Core World and Dominian
Exile.
Made with approavl of lore team.
Special thanks to Shimmer and Yonnimer for helping me with my first PR!
---------
Signed-off-by: Fyni <itsfyni@gmail.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This PR is intended to make raskariim more playable on the station. It
accomplishes this in two ways: First by allowing raskariim the choice of
fake religion, so they are not bound to always be fake ma'ta'ke, but can
also fake being for the suns.
The second thing is the addition of 3 new charms. These charms can only
be selected by raskariim in the loadout, and is intended as being
related to one of the three sects. If a character who is a raskariim
examines the charm, they get an extra message as shown in the images,
that the owner is also a raskariim. This would allow them to have a
chance to interact, without awkwardly forcing it OOC or through out of
game talking. This message doesn't show for non-raskariim, who should IC
be unable to identify that the charms belong to raskariim instead of
just being another kind of charm.
To accomplish the above, the religion check in the loadout was also
rewritten to permit multiple religions to be listed, so that both
raskariim types can select the charms.
<img width="325" height="334" alt="image"
src="https://github.com/user-attachments/assets/751832b9-89e3-4f0f-82ef-01206bbf09d9"
/>
Sprites (all by me):
<img width="196" height="153" alt="image"
src="https://github.com/user-attachments/assets/d8e93f0f-710e-450e-9629-d37558dcc519"
/>
Examine text if raskariim:
<img width="793" height="356" alt="image"
src="https://github.com/user-attachments/assets/b75eea3d-294f-4615-b2f0-bd10bf60c103"
/>
Examine text if not raskariim:
<img width="778" height="307" alt="image"
src="https://github.com/user-attachments/assets/24b64a1f-197f-44f0-9249-e93a9ce2bffe"
/>
---------
Signed-off-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
- Adds a Europa music cartridge, with 4 new sound tracks added for this
cartridge.
- Reduces the volume of all tracks I've added in prior PRs.
- Cannibalises the `lobby/crescent_expanse` tracks as — in hindsight — a
generic sector getting its own lobby tracks is a bit much and would mean
generic lobby tracks are never heard. saving it for major
systems/uncharted zones/special places. 1 sound file removed; 1 now used
in the Europa cartridge
### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
| sound/music/regional/europa/casting_faint_shadows.ogg | "casting faint
shadows" by Ikaiora
(https://ikaiora.bandcamp.com/track/casting-faint-shadows-2) | CC
BY-NC-ND 3.0 |
| sound/music/regional/europa/where_the_dusks_rays_leap.ogg | "where the
dusk's rays leap" by Ikaiora
(https://ikaiora.bandcamp.com/track/where-the-dusks-rays-leap) | CC
BY-NC-ND 3.0
| sound/music/regional/europa/deep_beneath-.ogg | "Deep Beneath the
Solemn Waves a Vast Underwater Landscape, Brimming With Bizarre, Eerily
Gleaming Cyclopean Structures of, What Must Surely Be, Non-Human
Origin, Stretched Out Across the Ocean Floor" by Unknown
Oceanographer/Under Jorden
(https://under-jorden.bandcamp.com/album/deep-beneath-the-solemn-waves-a-vast-underwater-landscape-brimming-with-bizarre-eerily-gleaming-cyclopean-structures-of-what-must-surely-be-non-human-origin-stretched-out-across-the-ocean-floor)
| CC BY-NC-ND 3.0
| sound/music/regional/europa/instrument_park.ogg | "Instrument Park" by
Little Bradley
(https://myprivateunderground.bandcamp.com/track/little-bradley-instrumental-park)
| CC BY-NC 3.0
| sound/music/regional/europa/way_between_the_shadows.ogg | "Way Between
The Shadows" by Mokusei No Maguro
(https://mokuseinomaguro.bandcamp.com/track/way-between-the-shadows) |
CC BY-SA 3.0 |
All sound files compressed to 20K. No transformation or remixing done.
dredging bandcamp for decent, copyright permissive songs by non—mass
production artists has been soul-draining lol. this is the last music pr
from me
Adds S'rendmarr and Ma'ta'ke versebooks to the game. Thanks to Tajara
Lore (especially @WilliamMurdoch) for the lore bits
Versebooks were added to loadout and now replaces the previous bible for
Tajaran priests.
In the future it might be best to merge the capabilities of bible with
versebooks (so religious versebooks can make holy water)
### Example Verses
S'rendmarr: _There is always hope beneath the light of the suns. Do not
fret at the horrors of this world, o child! Your guardians watch from
above._
Ma'ta'ke: _At that moment the king boasted of his victory and Mata’ke
quickly drew his sword, stabbing the king in his black heart who fell to
the floor. “One’s temper dictates the battle,” said Mata’ke as he wept
for his fallen battle-brother._
<img width="338" height="269" alt="image"
src="https://github.com/user-attachments/assets/da5311b6-e69a-4201-b268-099384f20f59"
/>
---------
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
**JUST BECAUSE IT SAYS "DELETED" IN ICONDIFFBOT DOESN'T MEAN IT'S BEEN
REMOVED. IT CAN BE RENAMED OR MOVED SOMEWHERE ELSE. PLEASE STOP
SPREADING MISINFORMATION THAT I'M DELETING EVERYTHING. JESUS CHRIST.**
- **The only hats removed are from budg's hat bloat (except the newsboy
hat, which has been touched up)**
- Human origin lore hats have been moved to Human - Xenowear. **NOT
REMOVED. MOVED.**
(It was kind of strange anyway they got special treatment. They aren't
restricted in any way, though, so essentially no difference.)
- Vysokan hats all rolled together into one selection.
- Beanies rolled into one selection.
- Miscellaneous, colorable hats rolled into one selection.
- Miscallaneous hats rolled into one selection.
- Dominian consular clothing items moved to be jobspawn items, like
every other consular. (Alt uniform outfits should be out from the
loadout anyway.)
- Pilotka caps, and whatever else they're called are all now named as
sidecaps.
- Renamed the Visegradi Nyakas to ear-flap cap. (I understand the
sentiment of blending lore into stuff, but putting it in the name isn't
helpful. I tried looking up Nyakas and all I'm getting is an obscure
brand of wine.) (Description unchanged.)
- Renamed padded cap to tanker cap.
- Bucket hats rolled together into one selection. (Removed pre-colored
boonies because it's just a clone of recolorabled ones.)
- And anything else I can't remember.
**Please don't spread misinformation after me and send the goon squad
after me.**
**Please just fucking message me and ask. Oh my god.**
---------
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Adds 3 Crescent Expanse regions due to how large a region it is:
- Crescent Expanse (West): Nralakk and Solarian heavy region.
- Crescent Expanse (East): Coalition and Solarian heavy region.
- Crescent Expanse (Uncharted): Deep Crescent expanse, independents and
certain surveyors only.
Also adds a Lemurian Sea (Uncharted) sector if we ever go there.
Adds a `ccia_link` variable for sectors. Only usage is to block outbound
faxes to Central Command. For uncharted sectors. EBS remains an option
due to necessary CCIA functions (eg. scuttling), per Bear's wishes.
Adds `low_supply` variants of most vending machines and dispensers. For
later use, none mapped in.
Removes the `TEMPLATE_FLAG_SPAWN_GUARANTEED` flag from the sensors
array, because it meant it wasn't affected by `sectors_blacklist`. The
sensors array isn't so important it needs to be in every sector anyway.
Removes Burzsia from the `ALL_DANGEROUS_SECTORS` list, as the crisis has
passed and humanitarian relief efforts completed.
Adds the `ALL_EVENT_ONLY_SECTORS` for limited usage during event
arcs/similar where canon odysseys or certain thirdparties may infringe
upon an arc's narrative. Allows selective enabling/disabling of canon
odysseys or third parties for said arcs. Not intended for liberal
application.
### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg | "Lüüü -
Weedance" by Lüüü, Obtained from
https://myprivateunderground.bandcamp.com/track/lu-u-u-weedance | CC
BY-NC-SA 3.0.
sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg | "Little
Bradley - Sunset Drive" by Little Bradley, Obtained from
https://myprivateunderground.bandcamp.com/track/little-bradley-sunset-drive
| CC BY-NC 3.0
sound/music/lobby/dangerous_space/dangerous_space_1.ogg | "You Can't
Kill The Boogeyman" by Karl Casey. Obtained from
https://karlcasey.bandcamp.com/track/you-can-t-kill-the-boogeyman | CC
BY 3.0
sound/music/lobby/dangerous_space_2.ogg | "Prison Planet" by Karl Casey,
Obtained from https://karlcasey.bandcamp.com/track/prison-planet | CC BY
3.0
sound/music/lobby/lights_edge/lights_edge_1.ogg | "Is Anyone Left?" by
Karl Casey. Obtained from
https://karlcasey.bandcamp.com/track/is-anyone-left | CC BY 3.0
sound/music/lobby/lights_edge/lights_edge_2.ogg | "Running From The
Wendigo" by Karl Casey. Obtained from
https://karlcasey.bandcamp.com/track/running-from-the-wendigo | CC BY
3.0
Adds a Xanu region for Xanu Prime to spawn in. Ice/barren asteroids as
possible spawns for mining operations.
Adds Xanu Prime as a visitable planet, with 2 regions: the arid
grasslands of Naya-Khyber; the tundra of Himavatia.
Only basic, super generic planet ruins included.
Random ground survey data available for scientific investigations.
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
| /html/images/scans/exoplanets/xanu_prime.png | Kyres1 (Sourced from
our own wiki) | CC BY-SA 4.0 |
| /sound/music/regional/xanu/xanu_rock_1.ogg | Swara Sutra
(https://swarasutra.bandcamp.com/album/indulgence) | CC BY-NC-SA 3.0 |
| /sound/music/regional/xanu/xanu_rock_2.ogg | Swara Sutra
(https://swarasutra.bandcamp.com/album/indulgence) | CC BY-NC-SA 3.0 |
Adds the requisite defines, icon, and information for the accent. Should
be limited to only Unathi with the Empire of Dominia origin.
---------
Signed-off-by: Evandorf <ej_denton@msn.com>
Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Unblacklists Sol Alliance citizenship from the consular selection.
Let free the many character designs awaiting.
A thanks to the Human Lore team for their Pharsalia arc :)
Per request of human lore.
Adds one new origin and six new accents.
Saturn becomes a new origin, under which three accents become options,
Iapetus (Cassinian), Enceladus, and Titan.
Mercury and Eris accents added to the currently unused 'Sol System'
origin, making it far less redundant than it currently is.
Unity Station accent added as an option for Earth origin.
"Stationer (STA): Similar to the conventional Terran accent, the
“Stationer” accent instead has its roots in North American English,
reflecting the Alliance’s history in the region.
Mercurian (MCY): Mercurian Common is often heard in the boardrooms of
Einstein Engines, which employs much of the planet’s population. Those
who speak with this accent are often – to no fault of their own –
regarded with suspicion by the SCC due to this association.
Enceladian (ENC): Enceladian Common is descended from the accents of
North and South America, and the residents of Saturn’s moon take pride
in ensuring their accent calls back to their ancestral homes on Earth.
Cassinian (CAS): Cassinian Common, the accent of Iapetus, is typically
associated with the Solarian Interstellar Intelligence Bureau, and
characters affiliated with it in Solarian movies will often talk like a
Cassinian: soft-spoken and generally polite, but reserved and often
distant.
Titanii (TIA): The largest offworlder population in the Sol System,
Titanii Common involves plentiful hand gestures and other visual
signals. Linguists have long theorized the prominence of hand gestures
in this accent comes from the moon’s EVA-centric industries.
Erisian (ERN): Erisian Common bears some resemblance to Lunarian Common
due to the planetoid’s long association with the Solarian Navy. Like its
counterpart, it is very hard to effectively replicate for an outsider."
Added armor defines
Converted raw strings use to defines
Added UT test to ensure people set the armor var correctly (to a list)
No player facing changes
Title. Characters with Orepit citizenship aren't meant to be either
Consular Officers or Diplomatic Aides, but the latter was showing up as
an option in the join menu so this should rectify that. Orepitters might
still able to be Diplomatic Aides for the Coalition depending on how
lore feels, but this doesn't touch that. Should count as a bugfix unless
maintainers decide it isn't.
---------
Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com>
**NOTE TO SYSADMINS: See "SQL Details" section below for information on
SQL modifications.**
Moves the data containing cargo items (i.e. the ones you order from ops
and get in the cargo shuttle) from the online database to the codebase.
Everything from suppliers to categories to individual items is now
code-side and editable by developers/contributors.
Refactors cargo items to use `singletons` instead of `datums` for
`cargo_supplier`, `cargo_category`, and `cargo_item`. Multiple-instnace
things like cargo_orders, etc. still use `datums`.
Fixed a bunch of strange discrepancies in categories, suppliers, and
pricing for various cargo items. I did a little bit, but it's exhausting
to go through all of it right now.
Clicking the 'Details' button on the Cargo Order app now actually gives
you details instead of bluescreening. Also added some UI elements to the
Cargo Order app - Cargo Control and Delivery remain untouched.
Overhauled the Cargo Order console TGUI window. It now has tabs on the
left, displays restricted access, supplier information, and boasts
search functionality.
### SQL Details
<details>
<summary>SQL Details [Click to Expand]</summary>
The following SQL tables should be deleted or deprecated from the server
database, as they are no longer in use:
- `ss13_cargo_items`
- `ss13_cargo_categories`
- `ss13_cargo_suppliers`
The included migration file, `V011__codeside_cargo`, creates a new table
`ss13_cargo_item_orderlog` to the DB. This **replaces**
`ss13_cargo_orderlog_items`. Because of this,
`ss13_cargo_orderlog_items` is deprecated and should either be deleted
or locked & preserved for logging purposes.
</details>
## Screenshots
---------
Signed-off-by: naut <55491249+nauticall@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Done with permission from @NobleRow and the synthetic lore team!
Reflects the outcome of the BitByte news article [found
here.](https://forums.aurorastation.org/topic/15858-bitbyte/page/4/#comment-179689)
For humans: "All Orepitters abroad in the Open Doors memorandum would
not work in jobs not requiring an education, and cannot work for
Hephaestus Industries because of its practice of not hiring Trinarists,
nor directly for the Stellar Corporate Conglomerate due to its distrust
of the Church; Orepitters who travel abroad independently, either
because they are not Trinarists or not participants in the memorandum,
are not held to this. Human Orepitters born in the Twenty Parishes
should select the Native Orepitter accent, while humans born in
Providence or the Marches should select the Providence accent."
For IPCs: "All Orepitters abroad in the Open Doors memorandum would not
work in jobs not requiring an education, and cannot work for Hephaestus
Industries because of its practice of not hiring Trinarists, nor
directly for the Stellar Corporate Conglomerate due to its distrust of
the Church; Orepitters who travel abroad independently, either because
they are not Trinarists or not participants in the memorandum, are not
held to this."
---------
Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com>
**REQUIRES SYNTH LORE TEAM APPROVAL!!!** If accepted, all added blurbs
are placeholders that can be altered as the synth lore team sees fit.
The reasoning regarding this PR is that I think the current in-game
information around Orepit and the available listed options for
citizenship are too confusing for anyone who may be interested in the
origins; humans can either choose Coalition of Colonies or no
citizenship, despite implied statelessness for humans being confusing
for anyone who might read their card or records and Orepit not being
integrated with the broader Coalition. This makes Orepit a separate and
unique citizenship in a similar vein to the format for the Free Tajaran
Council or Elyran Non-citizen Persons. The included important
information blurbs are for clarity of lore developments regarding the
Open Doors memorandum and megacorporate hiring standards for Trinarists.
I understand that I was told by NM that plans will be in the works for
Orepit after the Golden Deep arc and hope this isn't seen as
overstepping or a stopgap measure.
For humans
For IPCs
Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com>
Adds two new Dionae origins for the Viridis, reflecting the recent lore
changes for Hegemony Dionae. The Viridis noble origin comes with a new
accent, Gardensong.
Allows Dionae to be Hegemony consulars as noble Dionae now exist. Also
allows Dionae to take Sinta'Unathi to represent their greater levels of
integration into the Hegemony.
🚨 BREAKING NEWS: Our favorite dystopian frogs just got a little
less...Chinese? Down with the Social Score Order, up with the new Social
Compatability Index hyper federalist world.
: )
Also this is a Cerriq Koh memorial pull request.
---------
Signed-off-by: Warbidon <42331812+Warbidon@users.noreply.github.com>
Co-authored-by: Ben <91219575+Ben10083@users.noreply.github.com>
