Ccomp5950 e1fef1796e Merge pull request #4707 from DJSnapshot/tasers ...

replaced electrodes with insta hit taser beams

2014-04-07 02:16:01 -05:00

..

area

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-04-04 01:14:31 -05:00

dna

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

gamemodes

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

jobs

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

machinery

Merge pull request #4707 from DJSnapshot/tasers

2014-04-07 02:16:01 -05:00

magic

…

mecha

replaced electrodes with insta hit taser beams.

2014-04-05 17:13:09 -07:00

objects

Merge pull request #4690 from Glloyd/ear_stuff_2

2014-04-05 16:23:59 +01:00

turfs

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

vehicles

…

verbs

Fix for mods counting.

2014-02-02 02:33:53 +03:00

asteroid.dm

…

atoms_movable.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

atoms.dm

Adding blood to humans.

2014-02-09 13:32:42 +03:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

supplyshuttle.dm

Revert "Merge pull request #4513 from Aryn/master"

2014-03-24 13:55:23 +00:00