Adds a Ceres Lance beret, armor, and new uniform in preparation for
future CL events.
Also modifies the Ceres Lance crate to contain these items and carry a
more diverse weapon mix for merc rounds and ease of spawning during
event rounds..
---------
Signed-off-by: TheStryker <thestryker289@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
Re-creation of https://github.com/Aurorastation/Aurora.3/pull/21046 to
skip merge conflict hell. Brings us modern TGUI.
**ALTERNATE TITLE: TGUI HELLSCAPE PR
ABANDON ALL HOPE YE WHO ENTER HERE**
- [x] Migrate build tools (javascript -> typescript, bun for package
management).
- [x] Upgrade all TGUI dependencies and associated root files to
TG-congruent versions (axios, babel, dompurify, eslint, highlight,
marked, prettier, sass, source-map, stacktrace-parser, typescript).
- [x] InfernoJS -> React migrations
- [x] React cleanup and polish (migrate all remaining .js files to
appropriate .ts or .tsx filetype, all remaining hooks, linting, error
corrections, etc.)
- [ ] Test all remaining TGUI interfaces
Changes:
- Added various clothing shortcuts. You can now Alt-Click to adjust
layers, Alt-Shift-Click to remove accessories, etc. on most clothings.
- Tweaked inventory HUD icon frames to process shortcut clicks
(Alt-Click and Shift-Alt-Click for now). This means you no longer have
to click specifically on item icons to use shortcuts.
- Moved a block of code to where it belongs, minor code improvements.
There might cases where the new shortcuts collide with already present
snowflake shortcut interactions on certain items, i tweaked the ones i
stumbled into but there might be more
Repaths obj/machinery to obj/structure/machinery. **Note for
reviewers:** the only meaningful changed code exists within
**code/game/objects/structures.dm** and
**code/game/objects/structures/_machinery.dm**, largely concerning
damage procs. With the exception of moving airlock defines to their own
file, ALL OTHER CHANGES ARE STRICTLY PATH CHANGES.
Objects, _categorically_, are largely divided between those you can hold
in your hand/inventory and those you can't. Machinery objects are
already subtypes of Structures behaviorally, this PR just makes their
pathing reflect that, and allows for future work (tool actions, more
health/destruction functionality) to be developed without unnecessary
code duplication.
I have tested this PR by loading up the Horizon and dismantling various
machines and structures with tools, shooting guns of various types
throughout the ship, and detonating a bunch of explosions throughout the
ship.
For a robust crafting system, I need a new materials framework.
For a new materials framework, I need to clean up reagents.
To clean up reagents, I need to pare down foods from reagent holders.
To pare down foods from reagent holders, I need to port edibility
components.
To port edibility components, I need to port processing components.
To port processing components, I need to port tool behaviors.
This is all back-end code, no new features or functionality from this.
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.
Yeah I don't really have anything special to say about this one
> - imageadd: "Resprited woolen hats."
> - imageadd: "The colorable woolen hat now has an accent color."
> - rscadd: "An uncolorable, generic woolen hat has been added to the
loadout."
I trust you will be able to tell which one is the new sprite.
<img width="2049" height="1025" alt="woolen"
src="https://github.com/user-attachments/assets/462c765d-ed1c-4c52-a0c7-cdaf96c138e8"
/>
Currently, only Preferences Verbs use subcategories. As a result, all
other Verb tabs are only organized alphabetically, meaning that a single
mechanic (ie. languages) has its governing Verbs scattered rather than
grouped together.
Verb organization by Tab handles broad organization - IC, OOC, Objects,
etc.- highly effectively but requires the user to click-navigate to
other Tabs to access any other verbs.
Verb organization within a Tab can be handled by A.) subcategories and
B.) Verb name prefixes (such as Earphones - *****). The first option is
the clearest and cleanest, but consumes additional vertical space. The
second option conserves vertical space at the cost of visual clarity.
This PR attempts to reorganize Verbs by their Tabs, Subcategories, and
prefixes with the following priorities in mind:
- Minimal disruption; any radical change must be justified (don't move
shit around just for the sake of moving shit around.)
- Verbs which share common functions (such as Languages) should be
grouped together.
- Maintainability. Contributors should not need to memorize an
excessively convoluted Subcategories list; Subcategories must be
intuitive and simple.
- Subcategories should be used judiciously when grouping Verbs to
conserve vertical space. Example: Instead of creating a Subcategory for
Emotes, just rename Audible Emote and Visual Emote to Emote (Audible)
and Emote (Visual).
- Subcategories should highlight uncommon or unusual verbs when
reasonable. Example: There are several animal husbandry-related Verbs,
and because most characters will not have access to those verbs
regularly, we can be less conservative with space (because they'll be
gone most of the time) for the sake of emphasizing their availability.
This PR covers the IC, OOC, and Object Tabs.
Subcategories:
OOC.Chat (Chat functions)
- AOOC
- LOOC
- Devsay (moved from Special Verbs)
- Dsay (moved from Special Verbs)
- OOC
OOC.Debug (Fix shit)
- Fit viewport
- Fix chat
- Refresh TGUI
OOC.Round (Round information)
- Check Gamemode Probability
- Check Round Info
- Custom Event Info
- Vote
IC.Antag (Antag verbs w/o their own tab)
- Invite to the Loyalists
- Invite to the Revolutionaries
- Set Ambition
IC.Critters (More critter stuff than you'd expect there to be)
- Befriend Carp (Previous name 'Become Friends')
- Befriend Cat (Previous name 'Become Friends')
- Befriend Dog
- Befriend Ives
- Name Alien Species
- Name Animal
IC.Language (Language-related stuff)
- Check Default Language
- Check Known Languages
- Set Default Language
IC.Maneuver (Movement, positioning, etc.)
- Adjust walk speed
- Do Pushup
- Face Direction
- Look Down
- Look Up
- Move Downwards
- Move Upwards
- Rest
Object.Equipped (Equipped object stuff, mostly for drip)
- Adjust Badge
- Adjust Bag Straps (Backpacks)
- Adjust Goggles
- Adjust Mask
- Adjust Welding Goggles
- Adjust Welding Mask
- Change Glasses Layer
- Change Pants Layer
- Change Wrist Radio Layer
- Change Wristwear Layer
- Check Time
- Flip Badge
- Flip Belt
- Flip Eyepatch
- Flip Hat
- Flip ID card (ID card)
- Flip Radio (Clip-on radio)
- Flip Wristwear
- Fold Collar
- Lock Antenna(e)
- Point At Watch
- Raise Shroud
- Roll Up Cape Mantle
- Roll Up/Down Jumpsuit
- Roll Up/Down Sleeves
- Switch Belt Layer
- Switch ID Layer
- Switch Lanyard Layer
- Switch Shoe Layer
- Toggle Aviators (Like a dozen variants)
- Toggle Ceremonial Garment Lights
- Toggle Coat Buttons
- Toggle Coat Zipper
- Toggle Hair Coverage (For hats helmets etc)
- Toggle Hair Coverage (FOR BABY CARP!!!!!)
- Toggle Helmet Camera
- Toggle Hood
- Toggle Lyodsuit Mask
- Toggle Poncho Tail Coverage
- Toggle Shirt Buttons
- Toggle Suit Sensors
- Toggle Visor (Pilot helmet)
- Toggle Waistcoat Buttons
- Transform Holoclothing
- Voidsuit - Eject Suit Cooler
- Voidsuit - Eject Tank
- Voidsuit - Toggle Helmet
Object.Held (If you're HOLDING it, its probably relevant to you rn)
- Activate Held Object (Silicons; moved from IC)
- Alter Beacon's Signal (Radio beacon)
- Change Bite Size (Utensils)
- Change Pen Colour
- Choose Colour (Paint sprayer)
- Choose Decal (Paint sprayer)
- Choose Direction (Paint sprayer)
- Choose Preset Colour (Paint sprayer)
- Describe Prototype
- Draw Boot Knife
- Empty Bee Net
- Empty Spray Bottle
- Holster
- Name Gun
- Name Prototype
- Plant Flag (Flags)
- Print Plant Report
- Remove Chopsticks
- Remove Top
- Set Detector High-Bound (Light meter)
- Set Detector Low-Bound (Light meter)
- Set Hailer Message (Hailer)
- Set Timer (Timer igniter)
- Set Valve Pressure (Pneumatic cannon)
- Show Held Item
- Spin Cylinder (Revolvers)
- Switch Verbosity (Health analyzer)
- Toggle Chainsaw Power (Chainsaw)
- Toggle Flashlight Brightness (Flashlights)
- Toggle Gun Safety
- Toggle Hazard Vest
- Toggle Pinpointer Mode (Pinpointer)
- Toggle Mister (Backpack water tank. Goes into/out of hands)
- Twist Cap
- Use Scope
- Wield Pick/Drill
- Wield Two-Handed Weapon (Two-handed weapons)
Object.Cards (I fucking hate cards!!!)
- Deck - Deal
- Deck - Draw
- Deck - Pick
- Hand - Pick
- Turn Hand Into Deck
Object.Earphones (Enough here to separate out)
- Eject Music Cartridge
- Change Volume
- Next Song
- Pause/Unpause
- Play/Stop
- Previous Song
Object.Jetpack (This is probably really important to see quickly)
- Toggle Jetpack
- Toggle Jetpack Stabilization
Object.Tape Recorder (Enough here to separate out)
- Start Recording
- Stop Recording
- Clear Memory
- Playback Memory
- Print Transcript
- Eject Portable Storage
**IC tab example:**
<img width="1061" height="277" alt="Screenshot 2025-08-09 101813"
src="https://github.com/user-attachments/assets/a2afe92d-34fd-4160-bf68-b459a4195e26"
/>
**Objects tab example:**
<img width="1100" height="472" alt="Screenshot 2025-08-09 101807"
src="https://github.com/user-attachments/assets/a36e4c76-594e-4569-93ba-ffcda57e8760"
/>
Progress on DMDocs. PRing progress so far so there's not one mega PR
later with 1500 affected files.
I want my goddamn highlight text on what all these goddamn procs goddamn
do goddamnit. >:(
No actual code change anywhere in this PR, only comments.
---------
Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Extends and reworks how various extended information text (desc_info,
desc_build, desc_upgrades) are handled to make object interactions and
mechanics A.) much more clearly documented in-game and B.) much easier
to support from the back-end.
Almost certainly a candidate for test merge.
Assembly/Disassembly instructions are noticeably sporadic, largely due
to our current lack of a unified framework. That's a future thing I'd
like to attack so that it can be handled programmatically, but for now I
only targeted the biggest culprits as I came across them.
---------
Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
In an effort to make the way our sprites are organized make a little bit
more sense, this takes ALL the sprites in `icons/clothing` and moves
them over `icons/obj/item/clothing` or another appropriate file in the
case of non-clothing items.
A lot of these files had to be split since they lumped everything into
the same dmi which had to be changed since people, reasonably, expect to
find a hat in the folder named `hat` and not in the one where we're
supposed to keep uniforms in.
A lot of smaller files were also merged into already existing dmis where
it made sense.
Lastly, all the colourable items kept in `icons/obj/item/clothing` were
updated to the new palette. Those items were:
**Backpacks:**
- GD Sacred Icon
**Belts:**
- Fannypack
**Gloves:**
- Gloves
- Single Glove
**Hats:**
- GD Cowl
- GD Cube Hood
- Furred Crown
- Surgeon Cap
- Kippah
- Plain Hood
**Shoes:**
- Konyanger Gomusin
**Coats:**
- GD Eccentric Coat
**Uniforms:**
- Colourable Dress
- Shortsleeve Dress
- Evening Gown
- Open Shoulder Dress
- Assymetric Dress
- Tea Dress
- Long Sleeve Dress
- Colourable Scrubs
- Colourable Jumpsuit
Changes the last part of the name used in the code for the solarian army
beret from "beret/sapk" to "beret/sol/army".
Most clothing objects associated with the Solarian military have "sol"
in their name somewhere and I think it would be good for this one to as
well so it shows up alongside all the other ones when you look up "sol"
in, for example, the item spawner.
---------
Signed-off-by: Tag103 <194812614+Tag103@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>
This adds a fair bit:
- Splits the Hephaestus security and ERT/military uniform, since the
security uniform's description doesn't really match that of their
private military (and there is the possibility both may meet in a single
round)
- Adds a Hephaestus-colored captain's cap and gloves, which fits with
their current uniform
- Updates the cyclops uniforms to include rolled states.
- Added a Hephaestus physician's uniform and surgical outfit, and mapped
those into the ERT ship.
### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
| icons/clothing/under/uniforms/cyclops_uniforms.dmi (heph_military) |
[Paxilmaniac](https://github.com/Paxilmaniac) (tgstation) | CC-BY-SA 3.0
|
Fixes#15812
Firesuit sprites taken directly from Paradise Station
(https://github.com/ParadiseSS13/Paradise/pull/26671). However, my own
modifications were needed for the emissive sprites, the helmet sprites,
and the atmospheric technician sprites.
### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:
| Path | Original Author | License |
| --- | --- | --- |
| icons/clothing/kit/firefighter.dmi |
[ElorgRHG](https://github.com/ElorgRHG) (Paradise Station) | CC-BY-SA
3.0 |
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
This PR adds four new items for Orion Express characters. They can be
found in the Factions tab of the loadout.
Orion Softcap - found under "orion headwear selection"
Quick-E-Burger Apron
Quick-E-Burger Jumpsuit
Quick-E-Burger visor
All credit for the sprites goes to goblin.stev, I only did the funny
words that make them work ingame.
Basically, firefighter helmets didn't have heat protection assigned to
the head, nor did non-atmos firefighter helmets have a maximum heat
protection value assigned. This meant that
1. Heat would seep through the helmet and burn the mob anyway, making
firesuit loadouts essentially functionless
2. Vaurca Bulwarks had no way of protecting against fires because of the
above and the fact that they can't wear voidsuits
This rectifies that.
---------
Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com>
Fixes accessories not showing up on suit items.
Confusingly, accessories used the "_un" uniform suffix - this changes
them to use the "_ac" suffix.
Also moved some files around to their proper place (hair pins and bows
aren't accessories, they're ear slot items, etc.)
Fixes#20361Fixes#20352Fixes#20354
Refactored mousedrag procs, added signals, some safeguards, did some
cleanups around, renamed them to make a little more sense. Mostly put in
line with TG's code.
Fast clicking and releasing with a drag, depending on the grace period
and how fast it is done, can be counted as clicks, to aid in combat
scenarios where you spamclick.
Adds several new items to the Dionae loadout:
- Three sets of clothes and two hoods for voidtamers
- A jacket, cloak, two hats, and an undersuit for the ekane
- A narrows hardhat and jacket, as well as a slightly reworked jumpsuit
(made chonk)
- New Eternal Robes, the old ones are remaining for now but may be
reworked in the second wave of items
- Also removed some redundant rokz and serz items and the ships
themselves, these may be reworkedin the future, but for now aren't in
current lore.
More loadout items will ideally be coming soon for each factions in the
coming weeks/months.
---------
Signed-off-by: Yonnimer <31339047+Yonnimer@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
https://github.com/user-attachments/assets/b2ee7517-ca3a-4915-918b-319b518e1cb9
I have Schwann's blessing to add this
From the extended description;
"While a common sight in the Alliance's more rebellious or devastated
worlds such as Mars, the Army peacekeeper beret became a potent symbol
of Sol's triumph in the civil war. Nowhere else in the Spur are the blue
berets more omnipresent than the former capital of the Restoration Front
- Lycoris."
Available in the headgear tab- I've put it as an independent item since
the beret selection is for departmental / non factional berets, if
desired, I can move it under there.
---------
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Title
Banner sets for Tajaran religions (Suns and Ma'ta'ke) added to loadout
with 2 point cost
Useful for roles like chaplain that wants representation of more members
of the pantheon/ both suns
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
- Changes the values of the Heavy Helmet normally given to
mercs/traitors, for some reason it had ballistic armour bullet
protection and riot armour melee protection, this was inconsistent with
the accompanying plate carrier as well as other heavy armour sets.
- Changes the values of the dominian imperial army flak vest to be equal
to corporate security armour and thus in line with other light armour.
- Changes the values of TCAF light carpace's to be in line with
corporate security armour as well.
These changes aim to further distinguish light and heavy armour types
and improve consistency in our modular armour system.
The parent type for flight helmets defines unique head sprites for
Tajara and Unathi, intended for variations with a longer visor to
accommodate snouts. These aren't sprited for the SCC or TCAF variants,
so they just turned out invisible ingame. This sets the definition to
null for both of those until someone decides to sprite species
variations for them.
Moves the TCAF flight helmet to pilot_helmet.dm for neatness.
Resolves https://github.com/Aurorastation/Aurora.3/issues/19968
Refactored hitby to be in line with TG's version.
Refactored item weight defines to a more clear naming scheme, also in
line with TG's version.
Refactored how the movement bumps are handled, ported signals to handle
them, in preparation for the movement update.
Fixed disposal hit bouncing the hitting atom on the wall.
Items do not push other items anymore if they are tiny.
Sandstorm damage now respects armor, and will not damage Vaurca and IPCs
as much.
Ponchos, mantles, straw hats, Unathi robes, and hoods now protect
against weather.
Sandstorms can now cause pain and impair vision if a mob's eyes are
unprotected.
Adds protective gear to Wasteland ghostroles who didn't already have it.
---------
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Added tajara archeology items to the loadout menu so you can LARP as
your favorite archeologist, and changed the spelling of one of them to
be the US spelling like all of the other tajara archeology items.
---------
Signed-off-by: Silvore <62766806+Silvore@users.noreply.github.com>
+Added colourable slouch hat, found in colourable hat selection.
+Added colourable sun visor, found in colourable hat selection.
+Added colourable paperboy cap, found in colourable hat selection.
+Added colourable legionnaire cap, found in colourable hat selection.
+Added colourable artist beret, found in loadout.
+Added colourable tight beanie, found in loadout, hides hair.
-Moved TCFL softcap from 'softcap selection' to 'tcfl hat selection'.
All sprites made by me.
