Markolie e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise ...

Conflicts:
	maps/cyberiad.dmm

2015-03-04 19:34:21 +01:00

..

area

Bug fixes

2015-03-02 18:30:40 +01:00

dna

Merge pull request #418 from Fox-McCloud/Fixes-Genetics

2015-02-25 21:56:33 -05:00

gamemodes

Merge pull request #512 from Markolie/master

2015-03-04 10:23:36 -05:00

jobs

ERT equipment update

2015-03-04 17:16:19 +01:00

machinery

Merge branch 'master' of https://github.com/Markolie/Paradise

2015-03-04 19:34:21 +01:00

magic

…

mecha

Merge branch 'master' of https://github.com/Markolie/Paradise

2015-03-04 19:34:21 +01:00

objects

Merge branch 'master' of https://github.com/Markolie/Paradise

2015-03-04 19:34:21 +01:00

structure

…

turfs

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

vehicles

Tiny extra fix to display a fail message if glitching is attempted

2015-02-28 14:21:17 +01:00

verbs

Remove click delay from most things

2015-02-22 18:47:58 +01:00

asteroid.dm

…

atoms_movable.dm

Merge pull request #418 from Fox-McCloud/Fixes-Genetics

2015-02-25 21:56:33 -05:00

atoms.dm

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

json.dm

…

response_team.dm

ERT armory rework

2015-03-04 19:06:22 +01:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Gives cargo computers a contents link

2015-03-02 22:37:12 +01:00