88 Commits
Author SHA1 Message Date
60d09f31b1 TCAF expansion/rework stuff (#22717)
- renames/redescs/etc existing stuff to fit new TCAF lore
- lots of 4 years defunct TCFL stuff has been deleted or
repathed/renamed
- the tcfl peacekeeper ship that was soft-removed has been deleted
- the uniforms has also been modified and have had the necessary amount
of blue added. essentially i kitbashed the old TCFL uniforms with the
new TCAF uniforms

i probably missed a lot of tcfl stuff still.

---------

Signed-off-by: c#min7 <sadkermit01@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
2026-06-22 13:53:32 +00:00
aaea5d8a57 Assunzione & Port Volturno (#22258)
Contains assets, code, maps, etc. for Assunzione and Port Volturno. This
is something like v0.9 for live unit testing, etc. Do not merge yet.

### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/obj/structure/urban/arches.dmi |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/assunzione_neon.dmi |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/assunzione_signs.dmi (stafylia_sign) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/billboard.dmi (sign_assunzione1 & 2) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/poles.dmi (radial_floodlight) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/restaurant.dmi (menu_gyro) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/statues.dmi (aec_small) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/pottedplants_big.dmi (luce-vine-plant) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/pottedplants_small.dmi (luce-vine-plant) |
[Fyni](https://github.com/Fyniiy) | CC-BY-SA |
| icons/obj/structure/urban/billboard.dmi (sign_assunzione3) | Minzeyes
| CC-BY-SA |
| icons/obj/structure/urban/assunzione_96x110.dmi | Minzeyes | CC-BY-SA
|
| icons/turf/smooth/composite_brick.dmi |
[nauticall](https://github.com/nauticall) | CC-BY-SA |

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
2026-04-19 19:50:20 +00:00
Casper3667andGitHub f09bcd6cdd Replaces security disruptors with ballistics and removes all disruptors (#21987)
Security officers and the warden each get a .45 pistol loaded with
rubbers, and a spare rubber mag in their lockers.
The investigator get a new .45 revolver loaded with rubbers, based on
the konyang revolver, and a speedloader, also with rubbers.

The armory has had .45 speedloaders added to it, but is otherwise
untouched.

Also the autolathe gets to print .45 speedloaders now for the
investigator gun.

Practice ammo has been added to the autolathe.

The Elyran ERT had their disruptors replaced with plasma pistols.
Other non-Horizon disruptors were replaced with lethal .45.
Horizon disruptors were replaced with rubber .45.
2026-03-25 21:19:47 +00:00
Cody BrittainandGitHub 23789d4113 Sorts out existing projectile weapons (#22059)
This PR is intended to sort out our existing guns into something
resembling organization. In addition, ancient decrepit guns are removed,
and abstract paths are labeled as such.

In addition, all guns are now standardized to refer to their model.
Considering the huge number of weapons we have, a `pistol` is not
descriptive enough.

NOTE: At over 200 files touched, this is being split. Not everything was
sorted, but this is already a monster to sort through. The rest can
wait.
2026-03-25 15:37:50 +00:00
a1e55d0958 Right Arms of the Broken World - Tajara Gun Resprites (#21743)
Resprites 3 Tajaran rifles, expanding them to use a 48x32 canvas, and
brings them in-line with lore as written in terms of weapon design
history. Additionally, adds 6.8mm in the form of the Tajaran Z33
Tamparii cartridge to further separate Tajara and Human history and arms
development.

All weapon sprites are made by me, except the ba and ss sling which was
borrowed from the Dominian rifle sprites. Special thanks to Elorg for
help in making these not look awful.
<details><summary>Z33 Tamparii</summary>
<p>
<img width="331" height="332" alt="image"
src="https://github.com/user-attachments/assets/f9892dc8-9c6d-45c6-8779-3ad3e39abaed"
/>

An old caliber that continues to show its usefulness. The compromise
between weight and firepower, as well as room to change the powder load
has seen the cartridge remain in service across Adhomai.
</p>
</details> 
<details><summary>Tsarrayut Rifle (PRA)</summary>
<p>
<img width="572" height="387" alt="image"
src="https://github.com/user-attachments/assets/53327f3b-4b87-415e-8215-b1c2ccc08c9c"
/>

Redesigned to a general magazine-fed rifle. Not meant to be flashy or
cool, simply easy to mass-produce and train conscripts. Additionally,
still takes old bolt action rifle clips.
</p>
</details> 
<details><summary>Hotaki Marksman Rifle (ALA)</summary>
<p>
<img width="586" height="400" alt="image"
src="https://github.com/user-attachments/assets/c08986ec-1134-4869-8dc2-36b981a211f9"
/>

Carries many of the same lines and design from the Tsarrayut, especially
in the receiver. However, it was modified to be a bullpup for a longer
barrel. Higher bullet velocity for a similar overall length; perfect for
a marksman harassing down an enemy.
</p>
</details> 
<details><summary>Mrrazhak Assault Rifle (ALA)</summary>
<p>
<img width="483" height="332" alt="image"
src="https://github.com/user-attachments/assets/3f0a2885-49bb-418b-b956-4d2f89a60b40"
/>

Pretty much a shortened Hotaki. Intended to have a similar barrel length
to the Tsarrayut, but a shorter overall gun.
</p>
</details> 

WIP for the following items:

- [x] Golden Mrrazhak
- [x] Cartridge balancing
- [x] Addition/clean-up with uplink items
- [x] Addition/clean-up with ghost roles

---------

Signed-off-by: CatsinHD <31459154+CatsinHD@users.noreply.github.com>
Signed-off-by: Wildkins <john.wildkins@gmail.com>
Co-authored-by: Wildkins <john.wildkins@gmail.com>
2026-02-17 16:30:22 +00:00
Cody BrittainandGitHub 3f62424312 [MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)
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>
2026-02-01 05:14:26 +00:00
nautandGitHub dfe57a310f New boxes (#21439)
* Thoroughly resprites boxes. They're now more modular and, importantly,
colorable.
* Resprites cardboard, as a material.
* Repaths boxes behind the scenes to be more object-oriented, with boxes
being resorted into their own subtypes. You might notice this in the
gargantuan amount of files this PR changes.

Part of a bigger (yet modestly-sized still) resprites project. Atomized
the boxes bit into this PR specifically so that any conflicts don't
destroy any other spriting PRs.

<img width="652" height="273" alt="image"
src="https://github.com/user-attachments/assets/5590b22d-c9d7-49b5-9adf-0b6e01a6962b"
/>

<img width="383" height="345" alt="image"
src="https://github.com/user-attachments/assets/aab83040-2d5d-4283-b019-3d6bed2e3e47"
/>

<img width="142" height="343" alt="image"
src="https://github.com/user-attachments/assets/75a98d36-0171-4e48-9dec-de5511f35d39"
/>

<img width="127" height="225" alt="image"
src="https://github.com/user-attachments/assets/a1ff8b1b-bd2a-4c0d-b538-32fe401724c3"
/>

<img width="334" height="399" alt="image"
src="https://github.com/user-attachments/assets/e41330ac-ed4a-4e81-a87a-5ba901b47b5c"
/>
2025-10-07 16:59:55 +00:00
Cody BrittainandGitHub 829ea56c2a Added new Hephaestus uniforms (#20812)
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
|
2025-06-22 18:09:20 +00:00
hazelratandGitHub c9e5c6e591 Vaurca Attendant bugfixes (#19976)
This resolves every issue I could eyeball with Vaurca Attendants.

Added to every ghostrole where they're appropriate, mostly wherever
warriors are. Included as non-combatants in the TCAF ghostspawn.
Added to every list for species-specific loadout items and augments, so
they should be able to select them now.
Added to every job blacklist warriors were already on, most notably so
you can't join as a consular officer or corporate representative.
Accounts for attendants with a lot of admin outfits and ERT spawns.

Resolves https://github.com/Aurorastation/Aurora.3/issues/19974
2024-10-02 10:19:45 +00:00
40b8ac6a55 Replaces outdated Tajaran political books with versebooks (#19870)
The Political books for PRA,DPRA, and NKA have been replaced with
versebook equivalents, with extra quotes provided by Tajara Lore.

PRA:

![image](https://github.com/user-attachments/assets/d34208d7-c1cc-479b-aaa1-d3b3b2dc7b8c)

DPRA: 

![image](https://github.com/user-attachments/assets/714aac5c-b0a3-47df-b19f-8b3af388bce9)


NKA:

![image](https://github.com/user-attachments/assets/dfda1429-4578-40b0-9ecc-90972fd8236c)

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-09-13 10:17:11 +00:00
LynxSolsticeandGitHub 4a45d5454b Return of the Paramedic (#19125)
This PR brings back the more accurate title for First Responders, of
Paramedic, to bring it in line with some snippets of the SOP and to be
more accurate to the role itself, as both Security Officers and the rare
and elusive Firefighting Atmospherics Technician can be considered first
responders.

also I just like it better.

Changes any mentions of first responder in gear/access/etc to Paramedic
or PARAMEDIC where applicable.
2024-06-14 21:05:34 +00:00
19bb859923 Kosmostrelki now know Baghrar (#19356)
As stated in da lore: 'The Kosmostrelki are usually trained in the
martial art of Baghrar, both to instill discipline and help with their
balance. '

To reflect this, ERT and Kosmostrelki ghostroles now have the martial
art of Baghrar.

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-06-08 16:39:38 +00:00
FluffyandGitHub aeb27e21e1 Fixed vars getting set twice in the same class (#19294)
Fixed vars getting set twice in the same class
2024-06-02 23:13:31 +00:00
Avery MarieandGitHub b18e52b262 Tau Ceti Celebration Event PR (#18981)
This fixes the HAPT shuttle/replaces it and adds the VIP ghost role to
the CCIA spawner for this weekends coming event, and for future use.
2024-04-20 18:13:46 +00:00
RustingWithYouandGitHub 2f097a06fe Origin Trait Changes + Vaurca Language Traits (#18912)
Origin traits, as well as species natural armor, will correctly remove
themselves when culture/origin/species is changed.
Vaurca primary language processors (K'lax Sinta'Unathi and C'thur
Nral'malic) are now culture traits rather than loadout items. This means
that they can be added/removed from ghostroles automatically without
having to copypaste the same code 200 times.

Secondary language processors (Sinta'Azaziba, Freespeak, Tradeband) have
stayed as loadout items as some of them do not have distinct cultures or
origins they can be added to.
2024-04-15 08:37:05 +00:00
RustingWithYouandGitHub 58f4b508e5 Einstein ERT Rig Armor Changes & ID Fixes (#18888)
The Einstein ERT rigs now use the armor values of the SCC rigs instead
of the (terrible) values of the old NT ones, as well as having the same
initial modules.

Also fixes missing ID access on EE and Zeng ERTs
2024-04-07 19:54:46 +00:00
d2366cc925 Konyang Guns & Armor (#18803)
Adds the three Konyang-themed guns used during Silicon Nightmares events
- the Konyang service pistol, Konyang police SMG, and Konyang rocket
launcher. These have been mapped in where appropriate, with the
exception of the rocket launcher.

---------

Signed-off-by: Werner <1331699+Arrow768@users.noreply.github.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-04-04 10:37:15 +00:00
RustingWithYouandGitHub 21c74b3cae More ERTs 2: Even More ERTs (#18739)
* more erts

* fear of a bug planet

* klax

* fixes

* MORE

* #include moment

* a
2024-03-27 10:19:08 +00:00
f043918e98 Adds PRA full party member card (#18704)
* New card

* PRA consular spawns with cards

* Ghostroles member cards

* Update maps/random_ruins/exoplanets/adhomai/psis_outpost.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>

* Update maps/away/ships/pra/database_freighter/database_freighter_ghostroles.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>

---------

Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-23 17:24:07 +00:00
DreamySkrellGitHubDreamySkrell <>
85d27eb1d0 Outfits objectified (#18611)
* oof

* ugh

* fqewavdf

* 4ryh

---------

Co-authored-by: DreamySkrell <>
2024-03-10 11:33:32 +00:00
RustingWithYouandGitHub c0e2df4a02 Point Verdant ERT-Lite (#18554)
* point verdant ert-lite

* fixes bad outfit

* fixes garage

* fix to existing kasf ert
2024-03-06 07:10:48 +00:00
RustingWithYouandGitHub a1e7880835 separately colorable shirt and pants (#18234) 2024-01-20 03:46:55 +00:00
cadd19beac Ports the TG globals controller and converts globals. (#18057)
* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* Port the /TG/ globals controller.

* part 1

* part 2

* oops

* part 3

* Hollow Purple

* sadas

* bsbsdb

* muda na agaki ta

* ids 1-15

* 16-31

* 41-75

* bring me back to how things used to be before i lost it all

* the strength of mayhem

* final touches

* cl

* protect some vars

* update sdql2 to use glob

* stuff?

* forgot that is not defined there

* whoops

* observ

* but it never gets better

* a

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-26 01:16:02 +00:00
RustingWithYouandGitHub f99204a3b7 ert extravaganza (#18022) 2023-12-24 11:18:43 +00:00
FluffyandGitHub 4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
ioandGitHub 266634077e Adds New SCC ERT Hardsuits for Admin & Event Use (#17073)
* add new scc ert hardsuits

* changelog

* modifies the .dme

* restricts hardsuits to human only

* edit the changelog

* edit the changelog, part 2

* change dmi paths and hardsuit names
2023-08-19 20:32:35 +00:00
RustingWithYouandGitHub 57fd0eaf76 Vaurca filters now work as described (#16590)
* vaurca filters are now gas masks

* changelog

* fixes mapped-in vaurca masks
2023-07-13 13:32:44 +00:00
dd482c63af Update the codebase to 515. (#15553)
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-01-23 21:21:37 +01:00
Wowzewow (Wezzy)andGitHub a029656863 New backbag sprites and a lot more! (#14531) 2022-10-22 19:54:10 +02:00
SleepyGemmyandGitHub 55973cec38 Fixes NanoTrasen Typos (#14540) 2022-08-06 16:46:47 +02:00
Wowzewow (Wezzy)andGitHub 2bec6f1762 Fixes #14411 (#14412) 2022-07-10 18:31:18 +02:00
TheDanseMacabreandGitHub 4eb931cb81 Solarian Warlord Armor (#14359) 2022-07-01 12:40:24 +02:00
Wowzewow (Wezzy)andGitHub 176d2cfef0 Security Uniform Tweaks (#14229) 2022-06-20 18:02:16 +02:00
Wowzewow (Wezzy)andGitHub 2e01e9c72b Hazardous materials (#14219) 2022-06-12 22:47:15 +02:00
Wowzewow (Wezzy)andGitHub 46708ab624 Fixes some Sol uniforms having their uniforms being unable to be rolled (#14243) 2022-06-09 12:03:20 +02:00
VisVirificandGitHub 7b7ecb860b Eridani Loadout Items Re-Additions (#13977) 2022-05-23 18:34:05 +02:00
mikomyazakiandGitHub dae76e0558 Life improvements: Part 1 (#13912) 2022-05-18 14:22:43 +02:00
Wowzewow (Wezzy)andGitHub 1f5bbf4145 NBT Uniform Fixes (#13936) 2022-05-14 11:52:50 +02:00
Wowzewow (Wezzy)andGitHub 3e8f9e0901 The Uniformity : The Confluence of Conformity (#13773) 2022-05-13 12:08:50 +02:00
GeevesandGitHub 15aaa4e873 Powerful Mechs (#12193) 2021-08-31 18:05:09 +02:00
BLUNTFORCE420andGitHub 05f037ac50 Adds short-barreled AR to random weapons and FL ERT leader (#12399) 2021-08-30 18:25:48 +02:00
BLUNTFORCE420andGitHub e8a179070a Resprites the automatic .45. (#12391) 2021-08-29 22:33:30 +02:00
WickedCybsandGitHub 498be943bc Eridani ERT Access Fix (#12340) 2021-08-16 01:17:01 -03:00
AlberykandGitHub f66d8b9d83 Space Sector: Badlands (#11985) 2021-08-05 13:03:49 -03:00
WickedCybsandGitHub 83f62f9f2f TCFL & FSF ERT Pilot Changes + Harnesses for All (#12006) 2021-06-15 13:55:13 -03:00
Casper3667andGitHub 30e6f3462d compile error fix (#11955)
These two things prevents the server from compiling atm. Tested & confirmed to compile now.
2021-05-25 20:24:46 +03:00
WickedCybsandGitHub 9ad89a6f78 Legionnaires! Affix Bayonets! (#11925) 2021-05-25 14:33:09 +02:00
GeevesandGitHub 9a2c292cf1 Flight Helmets (#11834) 2021-05-12 21:41:01 +02:00
WickedCybsandGitHub 7caa4340ce Revisiting the Freelancers: A Rebalance (#11872) 2021-05-12 01:07:48 -03:00