Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

2017-01-11 23:11:29 +01:00

..

designs

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-11 23:11:29 +01:00

xenoarchaeology

Merge pull request #6065 from Crazylemon64/nullprefs_logging

2017-01-06 08:10:37 -05:00

xenobiology

Polishes up the reset_view proc, which is basically

2016-12-21 17:56:57 -08:00

circuitprinter.dm

Mass replace

2016-07-07 19:34:02 -07:00

designs.dm

…

destructive_analyzer.dm

Mass replace

2016-07-07 19:34:02 -07:00

experimentor.dm

Fix catwalk/plating issue, update Experimentor grammar and remove disabilities from nuke ops

2016-11-02 13:17:35 +01:00

message_server.dm

Merge pull request #5642 from Krausus/UniqueIDs

2016-09-12 15:32:20 -04:00

protolathe.dm

Mass replace

2016-07-07 19:34:02 -07:00

rd-readme.dm

…

rdconsole.dm

Adds a ui_key arg to ui_data

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

rdmachines.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

research.dm

SMES and Borg coolers can now be made again, R&D maxing works again

2016-09-19 16:33:06 -07:00

server.dm

Ports tg's associative-list research datums

2016-09-14 20:38:21 -07:00