Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-09-22 00:17:30 +02:00

..

area

Experimentor Addition--Telesci Removal

2015-09-17 00:59:38 -04:00

dna

Stop matter eaters from eating their own limbs and constructs and other important mobs whole

2015-09-18 07:14:07 +02:00

gamemodes

Pipenet overhaul

2015-09-21 02:11:54 +02:00

jobs

Adds in Russian Revolvers

2015-09-20 08:56:11 -04:00

machinery

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

2015-09-22 00:17:30 +02:00

magic

…

mecha

Pipenet overhaul

2015-09-21 02:11:54 +02:00

objects

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

2015-09-22 00:17:30 +02:00

structure

…

turfs

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

vehicles

More event tweaks

2015-09-17 22:25:35 +02:00

verbs

Merge pull request #2088 from Fox-McCloud/point-rework

2015-09-18 22:30:22 -04:00

asteroid.dm

Add xeno hide to xeno treasure cave

2015-08-18 18:41:07 +02:00

atoms_movable.dm

…

atoms.dm

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

json.dm

…

response_team.dm

Port Bay's intercom overhaul

2015-09-03 21:21:20 +02:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Update cargo shipping manifest

2015-09-14 18:38:14 +02:00