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

..

area

Add toxins launch area

2017-03-08 14:40:41 -07:00

dna

Merge pull request #6591 from Crazylemon64/ipc_power_cord

2017-03-07 22:25:11 -05:00

gamemodes

Merge branch 'master' into zefix

2017-03-09 17:20:31 +01:00

jobs

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

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

machinery

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

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

magic

THANKS KRASUS

2017-01-24 02:20:36 -05:00

mecha

Merge pull request #6714 from Jovaniph/recitencesound

2017-03-10 01:53:57 -05:00

objects

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

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

turfs

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

verbs

Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord

2017-02-06 01:42:32 +01:00

alternate_appearance.dm

…

asteroid.dm

Refactors Money

2017-03-06 04:52:03 -05:00

atoms_movable.dm

Goonlights

2017-02-05 07:08:17 -08:00

atoms.dm

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

2017-02-08 19:25:47 +01:00

data_huds.dm

Merge pull request #6103 from uraniummeltdown/borerimprove

2017-02-14 21:43:56 -08:00

response_team.dm

Addresses Tiger's concern, adds gene template applier

2017-03-08 06:18:29 -08:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Advanced Camera Speedup and Sounds

2017-02-07 21:46:50 -05:00