davipatury 781e66ec52 Fix conflicts.

2017-03-08 12:57:45 -03:00

..

alarm_monitor.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

atmos_control.dm

Make firelocks more lethal (autoclose, takes time to open with hand). Also fixes atmospherics remote control.

2017-02-18 17:00:50 +01:00

crew_monitor.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

human_appearance.dm

Allows IPCs to express themselves as a gender again

2017-02-26 12:06:16 -08:00

law_manager.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

nano_module.dm

…

power_monitor.dm

Card Mod, Power Monitor and Console Presets.

2017-02-20 19:38:23 -03:00