nevimer f9e9525dc8 Merge remote-tracking branch 'skrat/master' into upstream-jul-24 ...

# Conflicts:
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/tramstation/tramstation.dmm

2023-07-24 20:11:34 -04:00

..

preferences

Merge remote-tracking branch 'skrat/master' into upstream-jul-24

2023-07-24 20:11:34 -04:00

verbs

Makes Suicide properly impossible when the config to disable suicide is active (#22314)

2023-07-15 13:40:31 -07:00

client_colour.dm

[MIRROR] EMPs on robotic limbs will now disable them for 4-8 seconds rather than causing a 10-20 second full stun [MDB IGNORE] (#20818)

2023-05-03 22:29:02 +01:00

client_defines.dm

…

client_procs.dm

Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master

2023-07-19 02:18:09 -04:00

message.dm

…

player_details.dm

[MIRROR] feat: Respawn delay (optional) [MDB IGNORE] (#21736)

2023-06-10 19:34:30 -07:00

preferences_menu.dm

…

preferences_savefile.dm

[MIRROR] Makes TTS blips/enabled into one pref [MDB IGNORE] (#22633)

2023-07-24 16:36:44 -04:00

preferences.dm

Total refactor of the way we handle and draw mutant_bodyparts (+ missed mirrors that motivated me to do this) (#19635)

2023-03-16 13:07:24 +00:00