nevimer 0a432b7eed Merge remote-tracking branch 'skrat/master' into upstream-christmas ...

# Conflicts:
#	README.md
#	code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
#	code/game/machinery/bank_machine.dm
#	code/modules/unit_tests/station_trait_tests.dm
#	html/changelogs/archive/2023-12.yml
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/contractor/code/datums/midround/event.dm
#	modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgui/packages/tgui/interfaces/Fabrication/SearchBar.tsx
#	tgui/packages/tgui/interfaces/Spellbook.tsx

2023-12-24 23:15:34 -05:00

..

acid.dm

…

ai_basic_avoidance.dm

…

ai_behaviors.dm

[MIRROR] Targeting Datums Renamed (and global) [MDB IGNORE] (#24885)

2023-11-09 16:37:48 -05:00

antag_hud.dm

…

aura_healing.dm

…

clock_component.dm

…

conveyors.dm

…

digital_clock.dm

…

fastprocess.dm

…

fire_burning.dm

…

fishing.dm

[MIRROR] Reworks the fishing minigame into a game screen object from a TGUI interface [MDB IGNORE] (#23772)

2023-09-18 14:29:23 -04:00

greyscale.dm

…

instruments.dm

…

obj_tab_items.dm

…

obj.dm

…

plumbing.dm

…

processing.dm

…

projectiles.dm

…

quirks.dm

Merge remote-tracking branch 'skrat/master' into upstream-christmas

2023-12-24 23:15:34 -05:00

reagents.dm

…

singulo.dm

[MIRROR] [NO GBP]Gives the singularity more processing time [MDB IGNORE] (#25351)

2023-12-01 17:07:54 -05:00

station.dm

[MIRROR] Bridge Assistant Station Trait [MDB IGNORE] (#25667)

2023-12-24 22:54:11 +00:00

supermatter_cascade.dm

…

wet_floors.dm

…