AeraAulinandStxcking f93fb70d1c syndicate dual swords (#5725) ...

* sword

* requested changes

* Update Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml

Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>

2026-05-17 23:39:51 -04:00

..

_CD

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_DEN

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_DV

syndicate dual swords (#5725)

2026-05-17 23:39:51 -04:00

_EE

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_ES/Entities/Debugging

feat: Fancy Screenshake from Ephemeral Space (#5503)

2026-05-15 23:32:40 +02:00

_FarHorizons

Fix: Reactor Flatpack Paper Error (#5747)

2026-05-04 10:55:22 +02:00

_Floof

Move Stelloxadone ftl and reaction to _Floof namespace

2026-04-04 16:54:52 +02:00

_Funkystation

Fix up some missing localisation strings

2026-04-04 16:57:55 +02:00

_Goobstation

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_Harmony

tweak: minor Conspiracy tweaks (#5499)

2026-03-10 14:44:29 +11:00

_Impstation

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_Mono

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_NF

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_Nuclear14

Merge pull request #5316 from BarryNorfolk/merge_dec_jan

2026-04-11 18:27:39 +00:00

_Omu/Entities/Clothing

Cargo Mascot Updates (#4769)

2025-11-26 23:08:22 -06:00

_RMC14

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_Shitmed

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_Starlight

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

_White

Fixed agent visor not able to see silicon and kitsune health bars (#4864)

2025-12-05 01:58:46 +00:00

Accents

WYA to Where you at (#42350)

2026-04-04 16:57:53 +02:00

Access

hotfix id card console (#5103)

2026-01-02 00:37:21 +00:00

Actions

Add voice mask implant (#41551)

2026-04-04 16:56:50 +02:00

AlertLevels

Port: Nuclear Reactor (#5474)

2026-04-26 21:34:23 +00:00

Alerts

fix AI battery alert (#41879)

2026-01-26 19:25:32 +01:00

Anomaly

…

AppearanceCustomization

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

Atmospherics

Decouple GasPrototype IDs from Gas Enum (#41266)

2026-01-26 19:22:40 +01:00

Body

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Catalog

adding pockets to the automaturge robes and flannel jackets (#5646)

2026-05-18 00:12:20 -03:00

Chat

The station AI can be destroyed (#39588)

2025-12-29 11:39:07 -06:00

Chemistry

Early merge of #42158. Fixes medibots.

2025-12-29 11:41:54 -06:00

Codewords

Split codewords into its own system (#37928)

2025-08-07 00:09:11 +02:00

Damage

Merge pull request #5316 from BarryNorfolk/merge_dec_jan

2026-04-11 18:27:39 +00:00

Datasets

All Figurines Entity Table (#41775)

2026-04-04 16:56:52 +02:00

Decals

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

Device

Pagers (#5762)

2026-05-10 16:10:22 +02:00

DeviceLinking

Adding a random gate (#41627)

2026-04-04 16:56:52 +02:00

Entities

hyperblade tweak (#5721)

2026-05-17 22:38:48 -05:00

EntityLists/Tools

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Flavors

Add 2 New Reagents (Felinase and Caninase) (#41136)

2025-12-29 11:39:34 -06:00

GameRules

[new antag] hitman v0.9 (#5506)

2026-05-13 22:46:21 -03:00

GhostRoleRaffles

Rebalance the Ghost Role Raffles (#33157)

2026-04-04 16:57:19 +02:00

Guidebook

[new antag] hitman v0.9 (#5506)

2026-05-13 22:46:21 -03:00

Hydroponics

New/Tweak: Added another Mutation before Deus (#5575)

2026-05-17 20:09:50 -04:00

InventoryTemplates

Free Suit Storage (#5300)

2026-02-27 19:55:23 +01:00

Loadouts

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Magic

Remove wizards healing wand for the random magic item spell (#41365)

2026-01-26 19:22:37 +01:00

Maps

Glacier Rework (#4713)

2026-03-09 09:27:41 -05:00

NPCs

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Nutrition

Fix Ingestion Localization Pop-ups (#39437)

2025-11-23 15:22:19 -06:00

Nyanotrasen

adding pockets to the automaturge robes and flannel jackets (#5646)

2026-05-18 00:12:20 -03:00

Objectives

Port: Nuclear Reactor (#5474)

2026-04-26 21:34:23 +00:00

Paintables

Cherrypick: "Make more objects spray paintable" and related PRs (#4480)

2025-10-06 23:56:19 +00:00

Palettes

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

Parallaxes

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

Polymorphs

Vulpkanin Admin Smite (#40360)

2025-12-29 11:39:11 -06:00

Procedural

Remove unused tags tied to unused entities (#41366)

2026-04-04 16:57:18 +02:00

RCD

Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)

2026-04-04 16:57:55 +02:00

Reagents

Fix materials missed with Far Horizons nuclear reactor port (#5771)

2026-05-03 14:04:57 +02:00

Recipes

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Research

New/Tweak: Service Borg Module Rework (#5662)

2026-05-15 12:58:34 -04:00

Roles

Give headsets to the syndicate visitors (#5698)

2026-05-17 01:45:22 -04:00

Shaders

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

SoundCollections

Add new Lobby and Jukebox music by Darklyac (#5424)

2026-02-28 19:13:51 +01:00

Species

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

Stacks

Ironsands Structures (#39793)

2026-04-04 16:57:22 +02:00

StatusIcon

[FEATURE] More icons (#42200)

2026-04-04 16:57:23 +02:00

Store

Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)

2026-04-04 16:57:24 +02:00

StoryGen

…

Tiles

Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)

2026-04-04 16:57:55 +02:00

Traits

Warfarin and Hemorrhinol, Hemophilia turned into a StatusEffect (#41685)

2026-04-04 16:54:52 +02:00

Voice

[!!SPOILER!!]] April Fools / Event Feature (#5350)

2026-03-25 08:11:29 +11:00

Wires

Camera map (#39684)

2026-04-04 16:57:55 +02:00

World

…

XenoArch

Psionic Refactor (#4788)

2026-04-15 22:33:57 +02:00

ai_factions.yml

Xenoborgs part 7 (#40042)

2026-01-26 19:22:38 +01:00

audio.yml

Fix space ambient music (#33594)

2024-12-07 21:48:49 +00:00

bar_signs.yml

ports two barsigns from frontier (#35296)

2025-03-01 13:46:06 +00:00

borg_types.yml

New/Tweak: Service Borg Module Rework (#5662)

2026-05-15 12:58:34 -04:00

chameleon.yml

Syndicate locks are now selectable (#39532)

2025-11-23 15:22:31 -06:00

contraband_severities.yml

Added "highly illegal" contraband to guidebook (#38176)

2025-11-23 15:22:27 -06:00

edge_spreaders.yml

…

explosion.yml

Ignite atmosphere on explosions (#41262)

2026-04-04 16:57:17 +02:00

floor_trap.yml

prevent repeat TriggerOnCollide triggers (#40428)

2025-12-29 11:39:10 -06:00

fonts.yml

…

game_presets.yml

No more sub wizards in xenoborg preset (#41565)

2026-01-26 19:25:30 +01:00

holidays.yml

…

hud.yml

…

item_size.yml

…

lobbyscreens.yml

Add contest winners lobby art (#4635)

2025-11-12 12:22:42 +11:00

name_identifier_groups.yml

Updated various non-upstream entities components. Fixed YAML Linter errors.

2025-11-23 15:22:35 -06:00

ore.yml

New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)

2025-08-06 21:25:14 +02:00

radio_channels.yml

upstream merge 27/04/2025 (#3596)

2025-05-06 19:35:03 -04:00

round_announcements.yml

De-metashield Epsilon part 1 + DV sound files moving (#3867)

2025-10-23 07:26:55 +11:00

secret_weights.yml

[STAGING] Remove Wizard Roundstart Antag (#40983)

2025-12-29 11:39:32 -06:00

silicon-laws.yml

Move xenoborg lawsets above DeltaV

2026-01-26 19:29:45 +01:00

status_effects.yml

Revert "Nubody Merge" (#5807)

2026-05-12 21:05:30 +00:00

tags.yml

Xenoborgs now drop pieces of pinpointer (#42295)

2026-04-04 16:57:54 +02:00

themes.yml

upstream merge 27/04/2025 (#3596)

2025-05-06 19:35:03 -04:00

threats.yml

Cosmic Cult | Patch 1.1.0 (#3905)

2025-06-13 11:51:31 +02:00

tool_qualities.yml

Upstream Merge (June / July) attempt 2 electric boogaloo (#4607)

2025-11-06 18:22:39 +00:00

typing_indicator.yml

Add Fancy Speech Bubbles for Diona and Gingerbread (#37742)

2025-08-05 16:50:59 +02:00

weather.yml

add ash storms to lavaland (#2445)

2024-12-18 01:27:23 +00:00

whitelists.yml

…

wizardsDenWhitelists.yml

…