Artur ceba739231 Cooonflicts

2020-06-16 01:23:42 +03:00

..

hud

Merge remote-tracking branch 'upstream/master' into TGUI-3.0

2020-05-30 18:52:02 +03:00

adjacent.dm

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00

ai.dm

Adds a message to the AI to reconnect, since this is a common bug

2020-04-05 22:41:50 -07:00

click.dm

Merge remote-tracking branch 'citadel/master' into combat_rework

2020-06-02 21:49:43 -07:00

cyborg.dm

Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-16 21:12:56 -07:00

drag_drop.dm

Combat mode component. (#12338)

2020-05-27 18:00:32 -07:00

item_attack.dm

changes the inefficient attack message string and threshold. (#12498)

2020-06-12 17:08:10 -07:00

observer.dm

Merge conflict fix

2020-05-13 12:37:18 +03:00

other_mobs.dm

Fixing owner not being set in mutation/on_aquiring.

2020-03-22 15:23:05 +01:00

overmind.dm

…

telekinesis.dm

Porting update_icon improvements. Part 1.

2020-02-27 01:21:03 +01:00