20 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
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
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
LynxSolsticeandGitHub 7412ac5f3c Tweaks the names of the marksman rifle and mag. (#18246)
* PSIS moment

* removes the rifle from the uplink because matt said no
2024-01-22 11:26:13 +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
Cody BrittainandGitHub 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
79b8d5e471 sneed (#16493)
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-22 21:23:19 +00:00
316a80c231 Splits telecrystals into bluecrystals and telecrystals. (#16380)
* bluecrystals 1

* Splits telecrystals into bluecrystals and telecrystals.

* fixes

* dans ma tete ce n'est pas evident

* c'est toujours trop beau pour etre vrai

* on ne peut toucher le ciel des doigts

* thanks lily

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-18 12:43:49 +00:00
TheDanseMacabreandGitHub c158207328 Gyrojet/Railgun uplink removal, minor changes (#15262) 2022-12-09 12:32:55 +01:00
TheDanseMacabreandGitHub f2369325db Guns For Days (#15013) 2022-12-08 12:03:21 +01:00
TheDanseMacabreandGitHub 278f0d23b9 Antag Rebalances, Armory Restock (#13830) 2022-06-29 20:45:58 +02:00
KingOfThePingandGitHub 54de8f7254 Adds the super heavy pistol (#13829) 2022-06-11 16:11:33 +02:00
AlberykandGitHub e0a44e7a19 Give me the peac gun (#12295) 2021-08-17 17:08:42 +02:00
ScheveningenandGitHub 3bc8f4334c The Great Antag Uplink Rework (#11336) 2021-03-08 19:06:53 +01:00
GeevesandGitHub f54a89b9f8 Uplink Adjustment (#10496) 2020-11-27 10:52:28 +01:00
GeevesandWerner 931d56672a Uplink Revamp (#7974) 2020-01-15 18:28:11 +01:00
WernerandGitHub af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
Ronandskull132 c876437f91 Changes the placement of some items in the uplink (#2853)
Rearranges some items in the uplink datums so they all go from least expensive to most expensive. It appears that most items were already placed like that.
2017-07-01 17:53:14 +03:00
Alberykandskull132 2c6dad2dd3 More bay merge fixes (#1243)
- Fixes #1227 
- Fixes #1236 
- Re-add lamarr.
- Fix bootknife thing
- Fix a couple of things related to borgs
- Re-add our tator items
- Adding back all the hardsuit modules back to robotics
- Fixing a couple of missing sprites, like fireaxe cabinet
- Fixed missing computer sprites when no power
2016-12-18 22:13:42 +02:00
PsiOmegaDelta dcfe907ff0 Makes it possible to convert uplink TCs into physical form.
These crystals can be inserted into active uplinks, making it possible to trade them.
Variant of https://github.com/ParadiseSS13/Paradise/pull/3174/files.

The uplink now always shows the description to avoid annoying button shifting.
2016-01-11 16:58:42 +01:00