LetterJay cd06b77e01 Delete preferences_savefile.dm.rej

2017-06-19 20:54:04 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Adds Prolonging Prism as an application scripture (#1472)

2017-06-17 13:31:04 -07:00

__HELPERS

Fixes a to_chat runtime, adds macro for sending images (#1591)

2017-06-17 13:26:42 -07:00

_globalvars

[READY]Adds examine tooltips

2017-06-18 21:58:37 -05:00

_js

…

_onclick

Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142

2017-06-14 08:55:44 -05:00

citadel

quick reagent fix

2017-06-16 11:49:02 -04:00

controllers

increases round time

2017-06-17 22:47:32 -05:00

datums

Fixes testmerge display (#1644)

2017-06-17 13:15:21 -07:00

game

[READY]Adds examine tooltips

2017-06-18 21:58:37 -05:00

modules

Delete preferences_savefile.dm.rej

2017-06-19 20:54:04 -05:00

_compile_options.dm

Original mirrored too much.

2017-06-05 07:18:29 -05:00

world.dm

upstream-merge-28109

2017-06-13 01:10:21 -05:00