Artur 9d04b0835b Conflicts galore

2020-05-21 21:08:12 +03:00

..

ai

Conflicts galore

2020-05-21 21:08:12 +03:00

pai

Porting "Personal interaction messages to simple animals" and more. (#12268)

2020-05-18 04:46:57 -07:00

robot

Porting "Personal interaction messages to simple animals" and more. (#12268)

2020-05-18 04:46:57 -07:00

custom_holoform.dm

Revert "Merge branch 'master' into Yeehaw"

2020-01-08 12:26:45 +13:00

damage_procs.dm

Porting some return type annotations and bad keyword fixes, linter stuff.

2019-12-03 03:31:35 +01:00

death.dm

Standardises all files from CRLF to LF

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

examine.dm

Part 2

2019-11-19 18:00:56 +01:00

laws.dm

Standardises all files from CRLF to LF

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

login.dm

Update login.dm

2020-02-06 05:46:31 -07:00

say.dm

Standardises all files from CRLF to LF

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

silicon_defense.dm

Porting "Personal interaction messages to simple animals" and more. (#12268)

2020-05-18 04:46:57 -07:00

silicon_movement.dm

…

silicon.dm

Replaced all the extraneous flags with bitflags

2020-04-13 16:47:43 -07:00