Waterpig 26d27268d1 Fixes some weird conflict that appeared 6 months ago and nobody reported (#2668) ...

## About The Pull Request

The cap and HoS lockers had double the gun in them for some reason. Of
course, nobody reported this because it was double the gun.

## Why It's Good For The Game

No more double the gun

## Proof Of Testing

If it compiles it most likely works

## Changelog

🆑
fix: Captain and HoS locker now have the right amount of sabres and guns
respectively
/🆑

2024-12-11 10:23:15 +00:00

..

effects

Adds a flipping skillchip, the Chipped quirk, a chip connector implant, and a quirk to spawn with it. (#87082)

2024-11-16 00:42:13 -08:00

items

Industrial scanning sound (#87189)

2024-12-01 21:58:31 -08:00

structures

Fixes some weird conflict that appeared 6 months ago and nobody reported (#2668)

2024-12-11 10:23:15 +00:00

buckling.dm

TG Upstream Part 1

2024-10-19 08:04:33 -07:00

empulse.dm

…

items_reskin.dm

TG Upstream Part 1

2024-10-19 08:04:33 -07:00

items.dm

Public Logging Update (#1545)

2024-11-25 18:54:51 -05:00

obj_defense.dm

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

2024-10-23 23:27:16 -07:00

objs.dm

refactoring how materials effects are added to atoms (#86901)

2024-11-11 00:43:40 -08:00

structures.dm

TG Upstream Part 1

2024-10-19 08:04:33 -07:00