metalgearsloth e1901aa6b6 Revert "Make flare gun explode, damage and stun the player when used … (#24679) ...

* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114.

# Conflicts:
#	Content.Shared/Weapons/Ranged/Components/GunComponent.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs

2024-01-29 11:20:34 +11:00

..

Audio

Fix mispell of Atomic Amnesia MMX author (#24657)

2024-01-28 21:46:32 +11:00

Changelog

Automatic changelog update

2024-01-28 10:51:01 +00:00

ConfigPresets

Enable worldgen on WD (#23861)

2024-01-10 04:45:00 -07:00

Credits

Update Credits (#24645)

2024-01-27 18:21:16 -08:00

Fonts

…

IgnoredPrototypes

Add a way for bulk abstracting prototypes (#24140)

2024-01-16 21:39:14 -08:00

Locale

Revert "Make flare gun explode, damage and stun the player when used … (#24679)

2024-01-29 11:20:34 +11:00

Maps

Biodome satellite ruin (#24608)

2024-01-27 00:56:35 -07:00

Prototypes

Revert "Make flare gun explode, damage and stun the player when used … (#24679)

2024-01-29 11:20:34 +11:00

ServerInfo

Grammar fix (#24599)

2024-01-26 15:27:58 -05:00

Textures

Fix eris hud hand slot sprites (#24662)

2024-01-28 10:13:29 -05:00

clientCommandPerms.yml

Gateway destinations (#21040)

2023-11-14 19:23:40 -07:00

engineCommandPerms.yml

Content grid merging (#22448)

2024-01-21 17:41:10 +11:00

keybinds.yml

keybinds for opening bag/belt & context logic for opening storage window (#22238)

2023-12-08 12:43:37 -06:00

manifest.yml

Revert "Guidebook can POP OUT YAYYYY" (#20520)

2023-09-26 07:49:27 -07:00

map_attributions.txt

Kettle -> Gemini: RnD and Atmos revamp (#21866)

2023-12-01 13:17:08 -07:00

mapping_actions.yml

Fix mapping actions crashing on load (#20592)

2023-09-28 21:13:15 -07:00

migration.yml

Beacon localization (#24138)

2024-01-20 19:59:41 +11:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

2023-08-24 02:21:47 -07:00