Markolie a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix ...

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm

2017-03-10 12:42:37 +01:00

..

ai.dm

UID mass replace: src=\ref[src]

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

app.dm

Nano-Mob Hunter GO! WIP commit 3: The committening

2016-09-06 04:15:44 -04:00

cart_apps.dm

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

cart.dm

cleanup

2016-12-21 17:36:10 -05:00

chatroom.dm

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

core_apps.dm

Mass replace

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

messenger_plugins.dm

Final fixes

2017-03-05 16:42:14 +01:00

messenger.dm

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

mob_hunt_game_app.dm

minor styling fixes

2016-11-24 10:39:30 -05:00

PDA.dm

Fixes

2017-03-05 14:31:26 +01:00

pdas.dm

Streamlines the ghost-to-player creation process

2017-03-08 05:49:49 -08:00

radio.dm

Mass replace

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

utilities.dm

D:

2016-08-24 10:25:56 -07:00