nevimer e96f29d4a5 Merge remote-tracking branch 'Skyrat-SS13/master' into upstream-2024-06-16 ...

# Conflicts:
#	_maps/_basemap.dm
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/__DEFINES/surgery.dm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/modules/antagonists/changeling/changeling.dm
#	code/modules/clothing/neck/_neck.dm
#	code/modules/events/_event.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/kinetic_crusher.dm
#	code/modules/mob/living/basic/vermin/frog.dm
#	modular_skyrat/modules/borgs/code/robot_upgrade.dm

2024-06-16 20:54:25 -04: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.dm

[MIRROR] Small optimization for Aura Healing (#27346)

2024-04-18 02:58:03 +02:00

clock_component.dm

…

conveyors.dm

…

digital_clock.dm

…

fastprocess.dm

…

fire_burning.dm

…

fishing.dm

…

greyscale.dm

…

instruments.dm

[MIRROR] Instrument editor now uses TGUI (#26889)

2024-03-15 13:42:52 -04:00

obj.dm

…

plumbing.dm

…

processing.dm

…

projectiles.dm

…

quirks.dm

Rebalances being a lardass (#1417)

2024-05-22 23:00:41 -04: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] Fixes station trait based event weight modifiers being added for events that aren't valid on the current map (#28159)

2024-06-15 17:35:32 +01:00

supermatter_cascade.dm

…

wet_floors.dm

…