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

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +01:00

..

area

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

2016-12-23 19:32:19 +01:00

dna

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

2017-01-20 23:43:35 +01:00

gamemodes

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

2017-02-06 20:37:03 +01:00

jobs

nymphs and fixes

2017-01-26 03:38:25 -05:00

machinery

Merge pull request #6321 from uraniummeltdown/aidead

2017-02-06 07:13:05 -08:00

magic

THANKS KRASUS

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

mecha

Merge pull request #6286 from uraniummeltdown/aimech

2017-02-06 04:04:34 -08:00

objects

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

2017-02-06 20:37:03 +01:00

turfs

Merge pull request #6323 from Markolie/fixxxxx

2017-02-06 05:17:31 -05: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

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

2017-01-06 16:36:46 +01:00

atoms.dm

Add immortality talisman, add final items

2017-02-06 20:08:52 +01:00

data_huds.dm

Merge pull request #6286 from uraniummeltdown/aimech

2017-02-06 04:04:34 -08:00

response_team.dm

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

2016-10-31 14:46:58 +01:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00