uraniummeltdown c661609076 Merge remote-tracking branch 'remotes/upstream/master' into rodform ...

# Conflicts:
#	icons/mob/actions.dmi

2017-02-15 15:56:36 +04:00

..

area

Merge pull request #6161 from tigercat2000/goonlights

2017-02-10 19:21:20 -08:00

dna

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

2017-02-11 20:31:23 +01:00

gamemodes

Merge remote-tracking branch 'remotes/upstream/master' into rodform

2017-02-15 15:56:36 +04:00

jobs

Fixes an IAA bug

2017-02-13 03:18:19 -08:00

machinery

Merge pull request #6359 from Fox-McCloud/advanced-camera-fixup

2017-02-14 13:38:34 -08:00

magic

THANKS KRASUS

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

mecha

Dark Gygax & Seraph mechs get precision teleporters instead

2017-02-12 05:38:45 -08:00

objects

Merge pull request #6330 from FlimFlamm/box_sprite_addition

2017-02-14 23:12:41 -08:00

turfs

Merge pull request #6161 from tigercat2000/goonlights

2017-02-10 19:21:20 -08: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

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01: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

fixes merge conflict

2017-02-13 22:27:06 -08:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Advanced Camera Speedup and Sounds

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