112 Commits
Author SHA1 Message Date
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
7d058fc613 Jukebox TGUI update, Earphones autoplay, sound keys refactor (#21630)
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>
2026-01-22 16:54:40 +00:00
KingOfThePingandGitHub 92dee385af Gun Sound Reminder (#21193)
## About PR

In preparation for more new gun sounds, this PR simply adds a header to
the boxes.dm, which handles reload sounds for all types of guns to
remind contributors about the existence of the different types of sounds
and when they could/should be used.
The way the game handles reloads the sounds are tied to the magazines.
While testing something completely unrelated I noticed that a lot guns
recently added use the standard reload sound, instead of a maybe more
appropriate one.

No player facing changes.
2025-08-17 13:20:41 +00:00
72c032a847 Adds Armor-Piercing 9mm Magazines to the game (#20815)
-Adds Armor Piercing 9mm Ammo along with Pistol Magazines for it.

-It currently deals 12 damage and has 30 Armor-Penetration, allowing it
to deal more damage than .45 to armored opponents however it struggles
against unarmoured targets due to it's low damage output

Only available on the Antagonist Uplinks for now.


![9mmap2](https://github.com/user-attachments/assets/81b9f758-8e8e-4f0b-ad8a-b399c5fabd60)

---------

Signed-off-by: Birigilis <kavbest10@gmail.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2025-06-16 23:26:24 +00:00
GeevesandGitHub 255b802e1a Extended Rubber .45 Mags (#20241)
* Added extended rubber .45 mags to the autolathe.
2024-12-15 13:52:27 +00:00
FluffyandGitHub a3a4d46fa7 Hitby refactor (#19624)
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.
2024-07-28 20:52:08 +00:00
RustingWithYouandGitHub 5d67c4d0ad Unathi Guns & Armor (#18692)
Adds several pre-contact Unathi gun designs, some of which currently
accessible through antag gear crates and the Unathi pirate ghost ships.
All gun sprites done by Gecko.

Additionally buffs the generic Unathi armor and Hegemony armor to be
more on par with standard plate carriers instead of just being good at
melee and terrible at everything else, as well as respriting the generic
armor and rewriting flavor text. Armor resprites done by Dronz.
2024-04-01 21:40:28 +00:00
2977912fbe Point Verdant Delivery Points + Long Range Holopad in Cells + Konyang Police Fax + Police Speedloader fix + L + Ratio (#18531)
* Point Verdant Deliveries

* Holopad Police

* Refactor code

* Variables applied

* Spawn Limits

* nicer

* Fix bug (hopefully)

* Document

* Maptweaks + bugfix

* spell

* typo

* Bugfix

* no spaces

* Extra Document

* oops

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-02-29 17:39:10 +00:00
651bf48854 Bugfix pack #1. (#18221)
* Bugfix pack #1.

* oops

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-16 18:56:01 +00:00
7599b96e22 Uplink Additions: The Hitman DLC (#18152)
* adds the gun

* let's get it

* braindead danse

* Why is this here?

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* updates

* the curse of spaces

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-01-10 23:44:51 +00:00
4629903dd2 Adds Dominian Imperial Army gear. (#17971)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-25 16:19:40 +00:00
AlberykandGitHub 1ee40e02a5 Konyang Guns: Back into Action (#17851)
* gun stuff

* fixes

* forgot 💀

* newlines
2023-12-04 18:16:36 +00:00
0926d86d6c Adds a Xanan submachine gun (#17775)
* Added the Xanan SMG

* CL

* Icon file

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:28:13 +00:00
ae8d0db9e4 Adds the Xanan Shotgun (#17742)
* Added the Xanan shotgun

* New magazine sprites

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-13 20:19:52 +00:00
b79764e16c Added the Xanan service pistol (#17696)
* Added the Xanan service pistol

* Shrunk the Xanu pistol icon

* Request from loreteam

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-01 16:13:52 +00:00
c40d76fa57 Added the Xanan dNAC-6.5 assault rifle (#17613)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-21 23:11:58 +00:00
AlberykandGitHub 04268b3858 The DPRA enters the scene: the Hailstorm Ship (#15567) 2023-01-19 12:12:38 -03:00
FluffyandGitHub 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt AtlasandGitHub b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
FluffyandGitHub 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
FluffyandGitHub 043cbcce35 Added a blank 5.56 projectile and box (#15401) 2022-12-29 14:39:03 +01:00
SleepyGemmyandGitHub 2d06230cd1 Deck 3 Security Mapping Oversights Fixes (#15080) 2022-11-12 22:56:29 +01:00
BLUNTFORCE420andGitHub 08c709937d Resprites the Tanto, again. (#14401) 2022-07-11 12:34:03 +02:00
TheDanseMacabreandGitHub 278f0d23b9 Antag Rebalances, Armory Restock (#13830) 2022-06-29 20:45:58 +02:00
KingOfThePingandGitHub 0dfc713512 Adds approx. a billion new gun related sounds (#14169) 2022-06-18 22:17:14 +02:00
KingOfThePingandGitHub 54de8f7254 Adds the super heavy pistol (#13829) 2022-06-11 16:11:33 +02:00
AlberykandGitHub 784faa4c1c Adds the Grand Romanovich Casino as an away site (#13461) 2022-04-16 20:48:04 +02:00
BLUNTFORCE420andGitHub dff6489eeb Resprites the 10mm Machine Pistol (#13053) 2022-02-04 12:21:17 +01:00
GeevesandGitHub 04b55fb385 Pipegun Buff Again (#12507) 2021-10-30 13:57:51 +02:00
Matt AtlasandGitHub fb763d64c0 Revert "Pipegun Buff (#12365)" (#12429) 2021-08-31 21:56:36 +02:00
GeevesandGitHub 6c5e9aa111 Pipegun Buff (#12365) 2021-08-31 18:05:02 +02:00
Casper3667andGitHub 820bffcd8a adds a new elyran gun for the elyran consular (#12389) 2021-08-29 22:33:47 +02:00
BLUNTFORCE420andGitHub e8a179070a Resprites the automatic .45. (#12391) 2021-08-29 22:33:30 +02:00
BLUNTFORCE420andGitHub f35f17592e Resprites/renames the vintage .45 and adds two new .45 pistols. (#12387) 2021-08-28 03:37:56 +02:00
WickedCybsandGitHub 679d81440b Adds a Ballistic Carbine (#11695) 2021-04-22 12:01:46 +02:00
TheDanseMacabreandGitHub 43c5919307 Danse's Gun Changes 2: With a vengeance (#9878)
* joe

* Update bullets.dm

* Update boxes.dm

* Update automatic.dm

* Update minigun.dm

* Create dansemacabre-woodmanstillbad.yml

* Delete dansemacabre-woodmanstillbad.yml

* I'm stupid

* Update highly visible and dangerous weapons.dm

* Update bullets.dm

* Update bullets.dm

* reverts bluestocks

* Delete blaster_cabine.dmi
2020-09-19 12:12:18 +02:00
Wowzewow (Wezzy)andGitHub 307c214541 makes w_class use defines (#9848) 2020-09-06 17:37:56 -03:00
MarinaGryphonandGitHub 8ed9f7e7fb fixes #9758, #9684, #7803 (#9774) 2020-08-31 11:46:23 +02:00
Wowzewow (Wezzy)andGitHub 7114d3525f More new sounds and fixes equip sounds (#9464) 2020-08-12 11:17:39 +02:00
Wowzewow (Wezzy)andGitHub 9925a1353f .45 caliber ammo magazine fix (#9664) 2020-08-11 20:17:07 +02:00
Matt AtlasandGitHub 82437acd43 Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
2020-03-18 20:19:11 +01:00
AmoryBlaineandGitHub 3a8ffb19bb Firearm, Ammo, and Medical Storage Resprites (#8208) 2020-03-11 16:09:47 -03:00
mikomyazakiandGitHub 21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
GeevesandWerner 931d56672a Uplink Revamp (#7974) 2020-01-15 18:28:11 +01:00
WernerandGitHub cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
AlberykandWerner beb35d6fd3 Adds two away missions ghost roles (#7450) 2019-11-21 20:55:59 +01:00
AlberykandErki b0e6ece48b Gun update: the end of the space cold war (#6742)
-replaces the sprites of the guns that were pretty much justreferences to guns in real life, like the uzi and the dragunov, with new future sprites made by kyres
-adds the hand cannon
-makes some guns cheaper at the merchant
-fixes a broken message with the prank guns
-added a small animation when someone is hit by a blaster projectile
2019-07-24 21:31:09 +03:00
AlberykandErki ad9caa77ae Adds a couple of lore themed mercenary gear loadout (#6644)
Adds a bit of what is related here: https://forums.aurorastation.org/topic/11941-antagonist-rework-20/

Pretty much, adds a couple of gear crates that mercenary teams, seeking to do a lore related gimmick, can buy by pooling their crystals. Right now, it is just adds a couple of human related factions, such as eridani, sol alliance, elyra and the frontier.
2019-07-04 21:13:17 +03:00
AlberykandWerner 6393c26326 Adds a system for random explorable space sites (#6320) 2019-05-05 23:37:03 +02:00
OneOneThreeEightandWerner 1c22080e0f Changes to the traitor revolver (#5983) 2019-02-06 01:02:18 +01:00