Markolie 182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-08-30 00:38:03 +02:00

..

area

Centcomm Mods

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

dna

Irradiate prior to radiation checks

2015-08-28 19:52:25 +02:00

gamemodes

Prevent jobbanned people from becoming constructs

2015-08-29 18:56:36 +02:00

jobs

Add barber hud icon, add unique ID card for supervisors

2015-08-11 22:24:38 +02:00

machinery

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

2015-08-30 00:38:03 +02:00

magic

…

mecha

Update mecha weapons/emitter logging

2015-08-29 01:55:45 +02:00

objects

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

2015-08-30 00:38:03 +02:00

structure

…

turfs

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

vehicles

Pod Door Fix

2015-08-03 16:48:01 -04:00

verbs

Fix admins not seeing LOOC

2015-08-27 04:05:18 +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

…

json.dm

…

response_team.dm

ERT backpack update

2015-08-20 17:28:39 +02:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Merge pull request #1882 from Markolie/fixes

2015-08-28 18:59:54 -04:00