Tigercat2000 40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm

2015-05-10 14:15:51 -07:00

..

area

Ambience Runtime Fix

2015-05-05 16:44:08 -04:00

dna

Merge pull request #796 from TheDZD/shadowling

2015-05-04 20:38:20 -04:00

gamemodes

Fixes Blob Zombies

2015-05-07 17:35:43 -04:00

jobs

Various Fixes and Tweaks

2015-05-07 23:31:39 -04:00

machinery

Merge pull request #982 from tigercat2000/anothergibberthing

2015-05-10 16:07:21 -04:00

magic

…

mecha

Add toolbelt with smokebombs and bolas to owlman

2015-05-05 20:48:27 -04:00

objects

Merge remote-tracking branch 'upstream/master' into WeaponCleanup

2015-05-10 14:15:51 -07:00

structure

Completed adding Kidan Ambassador decorations

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

turfs

Ports VG's DeityLink's new explosion method

2015-05-09 01:56:25 -04:00

vehicles

Pod-Locator (probably temporary) sprites!

2015-04-08 13:55:40 -07:00

verbs

First part of Bay admin improvements

2015-04-23 10:01:45 -07:00

asteroid.dm

Asteroid resin fix

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

atoms_movable.dm

Water_act system - for all your watery needs

2015-05-09 05:43:47 -07:00

atoms.dm

Merge pull request #980 from FalseIncarnate/master

2015-05-10 16:05:57 -04:00

json.dm

…

response_team.dm

Prevents ghosts with AntagHUD joining an ERT

2015-05-05 23:15:17 +01:00

shuttle_engines.dm

Add CanAtmosPass to shuttle windows

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

skincmd.dm

…

smoothwall.dm

Fix wall smoothing

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

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-05-12 04:45:13 -04:00

sound.dm

Oops, forgot this.

2015-01-24 22:39:12 -05:00

supplyshuttle.dm

Removes Recursive Explosions

2015-03-19 03:23:14 -04:00