DZD 3939abaf5d Fix Conflicts and Sync with Upstream ...

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

2015-01-16 17:07:22 -05:00

..

area

Constructable newscaster, labor camp overhaul, other fixes

2015-01-16 21:50:33 +01:00

dna

Vox Heist port from Bay

2015-01-10 06:21:21 +01:00

gamemodes

Wizard Update Part 8

2015-01-16 16:39:12 -05:00

jobs

Merge pull request #170 from Markolie/master

2015-01-15 22:02:54 -05:00

machinery

Constructable newscaster, labor camp overhaul, other fixes

2015-01-16 21:50:33 +01:00

magic

…

mecha

Fixes

2015-01-15 19:42:15 -05:00

objects

Fix Conflicts and Sync with Upstream

2015-01-16 17:07:22 -05:00

structure

Completed adding Kidan Ambassador decorations

2014-07-23 13:24:51 -04:00

turfs

Constructable newscaster, labor camp overhaul, other fixes

2015-01-16 21:50:33 +01:00

vehicles

Space Pod Taser Change

2015-01-09 18:26:27 -05:00

verbs

Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port

2015-01-07 15:48:29 -05:00

asteroid.dm

Asteroid resin fix

2014-12-24 01:35:17 +01:00

atoms_movable.dm

Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.

2014-07-24 21:01:49 -04:00

atoms.dm

Detective Scanner

2014-12-17 08:10:03 -05:00

json.dm

…

response_team.dm

Actually give the ERT a PDA (forgot to include it a while back)

2015-01-14 01:42:16 +01:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Fix wall smoothing

2015-01-08 19:44:56 +01:00

socket_talk.dm

…

sound.dm

Stunning Changes

2014-12-06 02:33:31 -05:00

supplyshuttle.dm

Bug fixes, map fixes

2014-12-22 14:47:58 +01:00