104 Commits

Author SHA1 Message Date
Batrachophreno 1c8c0c2221 Bugfix pile (#22823)
Fixes several runtimes from the past few weeks, some additional material
repath regressions, and the fact that if I shoot you with a stream of
ionized deuterium particles, it doesn't riddle you with cancer.

changes:
- bugfix: "Fixes emergency shields runtiming when hit by thrown
objects."
  - bugfix: "Fixes several stale global list runtimes."
- bugfix: "Fixes several health percentage checks that could use unset
initial health values."
  - bugfix: "Fixes additional materials regressions in INDRA code."
  - bugfix: "Fixes invalid fuel injector depletion math."
- bugfix: "Makes accelerated particles apply radiation damage to living
mobs they pass through."
2026-07-12 18:06:28 +00:00
CatsinHD 130988fa44 6.8mm and PRA rifle rebalance (#22089)
Rebalances the 6.8mm bullet and it's AP variant to not be antag shredder
9000. Additionally, alters pricing in the cargo order list and adds an
AP variant of the 6.8mm to the cargo order list. The values for the
rounds are below.

6.8mm: 40 dam | 12 AP
6.8mm AP: 30 dam | 30 AP

Against 55 armor (major ballistics armor):
6.8mm: 13 damage
6.8mm AP: 18 damage
5.56: 16.67 Damage
5.56 AP: 25 Damage
7.62: 18.56 Damage

The thought process behind these values:
<details><summary></summary>
<p>
Adhomai does not make wide use of personal body armor. As a result,
ammunition does not prioritize defeating body armor. Therefore, it is
more effective the less armor one has, leading to a high damage value
but low AP values. As they are rifle power cartridges, there is still
some AP. The specific 6.8mm AP cartridge was created for defeating the
armor of the S'rand'marr coalition, thus why it is comparable to 7.62
</p>
</details> 

These values can be tweaked as needed to make the rifle and ammo
reasonable.
This PR DOES NOT modify the rifle itself, and therefore should not
conflict with #22088
2026-03-26 21:49:14 +00:00
Cody Brittain 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
CatsinHD 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
Batrachophreno 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
4000daniel1 31829145da Implements a delay to loading the PEAC & adds assisted loading (#21380)
Had to remake this PR since for some reason TGUI changes snuck in on
some commit on the last one.

As requested the PEAC now has to instead go through a 5 second windup
before being loaded. This also gave me the totally original, definitely
not stolen from elsewhere idea to make it possible for someone else to
load it instantaneously for you, making fast reloading and rapid fire
still possible through the power of teamwork.

<img width="2560" height="1440" alt="image"
src="https://github.com/user-attachments/assets/d71dd82c-0f53-4923-a3d4-b9a3b5240b88"
/>

---------

Signed-off-by: 4000daniel1 <95170823+4000daniel1@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2025-10-22 09:15:44 +00:00
Birigilis 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
courierbravo c1b97ec3ca Tranquilizer Rifle Part 1 - Something lost, something gained. (#19781)
Removes the tranquilizer rifle from the HoS's office, and places it in
the RD's office. Along with removing the box of shells from the HoS
locker, placing them in the RD's locker.
Changes the description of the rifle to move it away from being a 50 cal
sniper. Changed the shells to reflect this as well.
Expands the RD's office and reshuffles it slightly to make space for the
tranquilizer cabinet.

Part 2 will be a resprite of the rifle, to be added at a later date.
PR will need loremaster approval due to description involving corporate
lore.
2024-08-23 12:26:09 +00:00
Fluffy 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
Fluffy 3e1b9d4170 Repathed /obj/item/projectile to /obj/projectile (#19693)
Repathed /obj/item/projectile to /obj/projectile, same as TG and Bay,
that's pretty much it.
2024-07-27 10:09:46 +00:00
DreamySkrell d0c272b435 Cult Base Away Site (#18578)
![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/afe938e9-b3c9-4819-b74b-f403bdb57efd)

changes:
  - rscadd: "Cult Base away site."
  - rscadd: "Adds some mapped in cult runes."
- rscadd: "Adds ooc welcome message, separate from normal welcome
message."
  - rscadd: "Allows corpses to use outfits."
  - rscadd: "Allows corpses use different species."
  - rscadd: "Adds some generic outfits."
  - rscadd: "Ghostspawner spawn points are actually randomly picked."
  - bugfix: "Fixes marker layers."

---------

Co-authored-by: DreamySkrell <>
2024-04-20 21:14:47 +00:00
RustingWithYou 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
RustingWithYou 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
Geeves f2d815f11d Shotgun Capacity Buff (#18715) 2024-03-24 14:04:23 +00:00
RustingWithYou a16fce4b71 Konyang: The Infected (#18301)
* ipc zombies

punch sounds & corpses

jungle map & icon fix

sounds

zombie village

glowing screen: you should kill yourself, now

light

ship 1

da wreck

infected outpost

ok ok ok

globs & templates

* changelog

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* dmdoc & parent call

* unspeakable its patterns laid

* yeah

* glob

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* Update code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm

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

* Update code/modules/mob/living/silicon/robot/items/robot_tools.dm

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

* dmdoc

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-03 00:18:05 +00:00
TheDanseMacabre 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
shaky-jake d1603bf574 Courier’s Konyang Ruins (#18128)
* waagh

* first half

* weee happy new year :D

* behold, grass

* shale encrusted cliff my nemesis

* changelog

* oop

* pls go away lint

* weee

* format change

---------

Co-authored-by: ShakyJake <jakeisnowshaken@gmail.com>
2024-01-09 16:33:16 +00:00
Fluffy d8d063edc6 EMP Refactor & Multi Z-level EMPs (#17781)
* sdfasf

* sdfas

* dsf
2023-12-04 19:37:49 +00:00
Alberyk 1ee40e02a5 Konyang Guns: Back into Action (#17851)
* gun stuff

* fixes

* forgot 💀

* newlines
2023-12-04 18:16:36 +00:00
Cody Brittain 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
Cody Brittain 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
Cody Brittain 8c2c1c08f1 Frontier Cowboys now receive a lever action rifle (#17156)
* Frontier Cowboys now receive a level action rifle

* Icon and sounds for the Lever Action

* CL

* Attribution

* Added updated sprites by suethecake

* Ensure internal consistency
2023-08-30 22:36:52 +00:00
Geeves 391a9043ec PEAC Stuff (#16274) 2023-06-09 10:09:45 +00:00
Fluffy 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt Atlas b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
Fluffy 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
Fluffy 043cbcce35 Added a blank 5.56 projectile and box (#15401) 2022-12-29 14:39:03 +01:00
DreamySkrell 70f77b3ff9 Crashed elyran tanker (#14812) 2022-11-01 13:19:32 +01:00
TheDanseMacabre 278f0d23b9 Antag Rebalances, Armory Restock (#13830) 2022-06-29 20:45:58 +02:00
KingOfThePing 0dfc713512 Adds approx. a billion new gun related sounds (#14169) 2022-06-18 22:17:14 +02:00
KingOfThePing 54de8f7254 Adds the super heavy pistol (#13829) 2022-06-11 16:11:33 +02:00
Alberyk 784faa4c1c Adds the Grand Romanovich Casino as an away site (#13461) 2022-04-16 20:48:04 +02:00
alberyk 8bd145478d gun tweak 2022-01-31 00:52:06 -03:00
alberyk a61da95fc8 da gun 2022-01-19 02:03:58 -03:00
Alberyk e0a44e7a19 Give me the peac gun (#12295) 2021-08-17 17:08:42 +02:00
Geeves 6c55a954c3 Tracking Slugs (#10287) 2020-10-23 17:22:27 +02:00
Alberyk 59a3ed600b Bad Moon on the Rise: A Farewell to Arms edition (#9715) 2020-08-22 11:22:56 +02:00
Wowzewow (Wezzy) 7114d3525f More new sounds and fixes equip sounds (#9464) 2020-08-12 11:17:39 +02:00
Geeves 5fcfc33031 Ammo Piles (#9195) 2020-07-02 10:40:07 +02:00
Geeves 1fd1f528d2 Kataphract Supplies (#8529) 2020-06-16 23:29:33 +02:00
Matt Atlas 82437acd43 Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
2020-03-18 20:19:11 +01:00
Werner cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Alberyk a9d4e6ba5d Fixes some issues related to the pra away mission (#7488)
-fixes the commissar role not working properly, making some ghost roles check more robust
-fixes a couple of mapping errors on that space ruin
-fixes the nuclear launcher magazine not accepting the proper bullets
-fixes the cosmonaut suit not accepting tanks on the suit storage slot
2019-11-23 11:10:29 +02:00
Alberyk beb35d6fd3 Adds two away missions ghost roles (#7450) 2019-11-21 20:55:59 +01:00
Alberyk 878f99f8a0 Adds emp interaction for simple mobs and some pra robots tweaks (#7314)
-ranged pra robots now leave behind empty casings after firing
-pra robots will now take honorary membership cards in consideration when chosing targets
-adds emp damage to synthetic simple animals
2019-11-04 09:11:17 +02:00
Alberyk 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
Alberyk 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
Alberyk 6393c26326 Adds a system for random explorable space sites (#6320) 2019-05-05 23:37:03 +02:00
Alberyk 5755810b34 Adds wielded laser rifle sprites, improves freezeray and tcfl guns (#6133) 2019-03-13 23:03:46 +01:00
Alberyk ed0297a697 The Tau Ceti Foreign Legion (#5779)
This pr adds the Tau Ceti Foreign Legion, at the request of the lore team, to replace/be an alternative to the ert.
2018-12-30 12:06:21 +01:00