nevimer a9a59ed3f9 Merge remote-tracking branch 'origin/upsteam-12-15-25-revert-unique-reskins' ...

# Conflicts:
#	_maps/bubber/automapper/templates/centcom/interlink_adminoffice.dmm
#	_maps/map_files/BoxStation/BoxStation.dmm
#	_maps/map_files/generic/CentCom_skyrat_z2.dmm
#	_maps/map_files/moonstation/moonstation.dmm
#	code/modules/holiday/holidays.dm

2026-01-12 22:09:10 -05:00

..

anomaly

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-05

2025-11-05 19:43:07 -05:00

ghost_role

makes xenobio stuff use interact_with_atom (#93918)

2025-11-20 19:06:23 -06:00

holiday

Refactors the safe Christmas trees to use a safe present subtype by way of a blacklist (#5027)

2025-12-27 16:20:08 -08:00

immovable_rod

…

meteors

…

shuttle_loan

…

space_vines

Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

2025-11-29 22:49:21 -05:00

wizard

…

_event_admin_setup.dm

…

_event.dm

…

aurora_caelus.dm

Sound Mixer Part 2 (#89251)

2025-03-12 16:05:30 -04:00

brain_trauma.dm

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

2025-02-20 00:00:19 -08:00

brand_intelligence.dm

Corrects 200+ instances of "it's" where it should've been "its" instead (#85169)

2024-07-21 15:47:03 -04:00

bureaucratic_error.dm

…

camerafailure.dm

Moves camera update handling to background subsystem, (maybe) fixing lag (#92208)

2025-11-08 01:43:48 +01:00

carp_migration.dm

[MIRROR] Refactors admin event setup (again) [MDB IGNORE] (#19728)

2023-03-10 06:48:54 +00:00

communications_blackout.dm

…

disease_outbreak.dm

…

dust.dm

[MIRROR] Minor Major Space Dust update, Dust Stormfront station trait [MDB IGNORE] (#20736)

2023-04-24 23:39:23 +01:00

dynamic_tweak.dm

…

earthquake.dm

Partially reverts #89619, where I partially reverted #87936; Puts back the mining and damage AOE damage on Mech PKA, but improves the standard modkits as well (#89993)

2025-03-19 07:57:52 +01:00

electrical_storm.dm

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

2025-02-20 00:00:19 -08:00

fake_virus.dm

Fix runtime in fake virus event (#3664)

2025-04-29 00:04:19 -07:00

false_alarm.dm

…

gravity_generator_blackout.dm

[MIRROR] Machine list is now stored in SSmachines | Remove excessive use of global lists for specific machine types [MDB IGNORE] (#22481)

2023-07-15 22:51:23 -04:00

grey_tide.dm

…

grid_check.dm

…

heart_attack.dm

Heart Attacks are More Violent, and You Can Defib People Repeatedly to Fix Them Like in a Medical Daytime TV Show Drama (#89775)

2025-04-29 17:41:26 -06:00

ion_storm.dm

…

market_crash.dm

…

mass_hallucination.dm

[MIRROR] Refactors admin event setup (again) [MDB IGNORE] (#19728)

2023-03-10 06:48:54 +00:00

mice_migration.dm

Reorganizes the sound folder (#86726)

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

portal_storm.dm

…

processor_overload.dm

…

radiation_leak.dm

[MIRROR] Attack chain refactoring: Broadening tool_act into item_interact, moving some item interactions to... atom/item_interact / item/interact_with_atom [MDB IGNORE] (#25516)

2023-12-09 08:22:19 -05:00

radiation_storm.dm

[MIRROR] Grand Ritual: Alternate Wizard objective (Wizard Events II) (#72918) [MANUAL MIRROR] (#19751)

2023-03-10 05:10:51 +00:00

sandstorm.dm

The crew is no longer encouranged to assist in repairs. (#92238)

2025-07-30 17:37:28 -04:00

scrubber_overflow.dm

The Glitterening (#92226)

2025-08-04 20:53:39 -04:00

shuttle_catastrophe.dm

Makes shuttle docks keep track of their position to ensure that shuttle catastrophe does not cause a random crashlanding (#92492)

2025-08-19 22:30:39 -04:00

shuttle_insurance.dm

Remove data systems in favor of global datums (#82943)

2024-04-30 05:48:11 +00:00

stray_cargo.dm

Cargo can buy more presents at Christmas time (#94251)

2025-12-12 02:10:31 +11:00

supermatter_surge.dm

Reorganizes the sound folder (#86726)

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

tram_malfunction.dm

Tram spoiler/malf fix #88371 (#2634)

2024-12-07 16:17:34 -07:00

vent_clog.dm

Adds the bloodroach (#91383)

2025-06-05 20:05:25 -04:00

wisdomcow.dm

[MIRROR] Wisdom Cows contain unusual milk (#27086)

2024-04-04 13:49:44 -04:00

wormholes.dm

Guncode Agony 4.1: Portal Intermission (#87803)

2024-11-14 19:53:57 +01:00