Artur 9d04b0835b Conflicts galore

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

..

combat

Changes repair value

2020-05-14 20:29:30 +02:00

equipment

Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.

2020-05-02 00:00:49 +02:00

medical

Standardises all files from CRLF to LF

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

working

Porting update_icon improvements. Part 1.

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

mech_bay.dm

Ports https://github.com/tgstation/tgstation/pull/50497

2020-04-23 09:55:28 +03:00

mech_fabricator.dm

Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.

2020-05-02 00:00:49 +02:00

mecha_actions.dm

s

2020-02-03 00:47:51 -07:00

mecha_construction_paths.dm

*crys*

2020-05-08 15:42:35 -04:00

mecha_control_console.dm

Ports https://github.com/tgstation/tgstation/pull/44525, and

2020-04-23 17:36:13 +03:00

mecha_defense.dm

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

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

mecha_parts.dm

Ports https://github.com/tgstation/tgstation/pull/44525, and

2020-04-23 17:36:13 +03:00

mecha_topic.dm

Field of Vision component. (#12075)

2020-05-15 15:25:04 -07:00

mecha_wreckage.dm

Standardises all files from CRLF to LF

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

mecha.dm

Field of Vision component. (#12075)

2020-05-15 15:25:04 -07:00