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

..

beds_chairs

[EARLY PULL] Fixes benches attempting to add a nonexisting armrest overlay (#87368) (#2655)

2024-12-08 22:24:56 +02:00

cannons

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

construction_console

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

crates_lockers

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

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

gym

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

icemoon

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

lavaland

Industrial scanning sound (#87189)

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

plaques

Puts blood back on floor plane, puts runes on floor plane (removes shadows from blood and runes) (#87013)

2024-11-11 00:43:35 -08:00

signs

Spelling Fixes (#86056)

2024-09-10 17:04:59 +02:00

transit_tubes

TG Upstream Part 1

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

water_structures

Fixes water overlays showing on toilets facing directions other than SOUTH (#86878)

2024-09-25 21:02:01 -06:00

ai_core.dm

TG Upstream Part 1

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

aliens.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

bedsheet_bin.dm

TG Upstream Part 1

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

billboard.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

bonfire.dm

Ragnarok/Lattice/Species post-merge tune-up (#86606)

2024-09-29 16:38:09 +02:00

broken_flooring.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

cat_house.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

chess.dm

…

containers.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

curtains.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

deployable_turret.dm

TG Upstream Part 1

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

destructible_structures.dm

Nobody expects the span inquisition: replaces most <span>s with macros (#86798)

2024-09-26 19:36:13 +00:00

detectiveboard.dm

Audits tgui_input_text() for length issues (#86741)

2024-09-20 22:46:41 +00:00

displaycase.dm

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

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

divine.dm

…

door_assembly_types.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

door_assembly.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

dresser.dm

TG Upstream Part 1

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

electricchair.dm

Fixes electrified chair overlay layering (#87228)

2024-12-01 22:06:24 -08:00

extinguisher.dm

TG Upstream Part 1

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

fake_stairs.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

false_walls.dm

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

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

fans.dm

…

fence.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

fireaxe.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

fireplace.dm

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

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

flora.dm

New Icebox Ruin - Hunters Lodge (#86927)

2024-11-11 00:43:39 -08:00

fluff.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

girders.dm

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

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

grille.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

guillotine.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

guncase.dm

TG Upstream Part 1

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

headpike.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

hivebot.dm

…

holosign.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

janitor.dm

TG Upstream Part 1

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

kitchen_spike.dm

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

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

ladders.dm

TG Upstream Part 1

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

lattice.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

life_candle.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

loom.dm

…

maintenance.dm

TG Upstream Part 1

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

mannequin.dm

TG Upstream Part 1

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

memorial.dm

…

mineral_doors.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

mirror.dm

TG Upstream Part 1

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

morgue.dm

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

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

mystery_box.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

noticeboard.dm

TG Upstream Part 1

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

ore_containers.dm

…

petrified_statue.dm

Fixes petrification not removing NOBLOOD trait after ending (#86712)

2024-09-17 15:02:52 -04:00

pinatas.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

plasticflaps.dm

TG Upstream Part 1

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

railings.dm

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

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

reflector.dm

TG Upstream Part 1

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

safe.dm

TG Upstream Part 1

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

secure_safe.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

showcase.dm

TG Upstream Part 1

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

shower.dm

bubber edits

2024-11-16 00:53:11 -08:00

spawner.dm

Reorganizes the sound folder (#86726)

2024-09-23 22:24:50 -07:00

spirit_board.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

stairs.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

syndicate_uplink_beacon.dm

…

table_frames.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

tables_racks.dm

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

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

tank_dispenser.dm

Storage / table interactions at the bottom of the interaction chain (#85512)

2024-09-12 23:48:19 +02:00

tank_holder.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

toiletbong.dm

Wallening Revert [MDB Ignore][IDB Ignore] (#86161)

2024-09-03 10:41:51 +02:00

training_machine.dm

TG Upstream Part 1

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

traps.dm

Fixes improper static list declarations + adds grep for it (#87207)

2024-11-16 00:44:53 -08:00

votingbox.dm

Audits tgui_input_text() for length issues (#86741)

2024-09-20 22:46:41 +00:00

windoor_assembly.dm

Audits tgui_input_text() for length issues (#86741)

2024-09-20 22:46:41 +00:00

window.dm

New Icebox Ruin - Syndicate Biodome (#86957)

2024-12-01 12:06:20 -08:00