Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

2015-09-15 04:18:27 +02:00

..

area

Centcomm Mods

2015-08-27 12:59:37 -07:00

dna

Monkey/human transform fixes

2015-09-14 22:13:32 +02:00

gamemodes

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

2015-09-15 04:18:27 +02:00

jobs

Simplify check_access_list

2015-09-03 21:56:32 +02:00

machinery

Merge pull request #2040 from Markolie/guns

2015-09-14 22:11:33 -04:00

magic

…

mecha

Death RIPLEY buff

2015-09-13 18:01:38 -04:00

objects

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

2015-09-15 04:18:27 +02:00

structure

Adds chickenman and clown statues

2015-05-28 15:55:55 -04:00

turfs

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

vehicles

unused var axing

2015-09-04 18:04:34 -04:00

verbs

Remove obsolete code

2015-08-31 20:00:47 +02:00

asteroid.dm

Add xeno hide to xeno treasure cave

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

atoms_movable.dm

Powernet rework

2015-07-31 23:59:41 +02:00

atoms.dm

Pass II

2015-07-09 19:51:40 -04:00

json.dm

…

response_team.dm

Port Bay's intercom overhaul

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

shuttle_engines.dm

Add CanAtmosPass to shuttle windows

2015-04-30 19:45:48 -07:00

skincmd.dm

…

smoothwall.dm

TG Supermatter Port

2015-06-30 21:07:08 -04:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

R&D Update and Fix & Cargo Tweaks

2015-09-07 20:03:06 -04:00