PsiOmega 0731badf87 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm

2014-11-30 10:54:15 +01:00

..

area

Nukeops shuttle docking

2014-11-29 03:51:45 +01:00

dna

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

gamemodes

Dead chat will get announcements when someone joins or leaves it.

2014-11-28 13:05:26 +01:00

jobs

Merge pull request #7097 from GinjaNinja32/sensors

2014-11-22 22:36:40 +01:00

machinery

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

2014-11-30 10:54:15 +01:00

magic

…

mecha

Merge remote-tracking branch 'upstream/dev' into RoboCircuit

2014-11-27 08:58:34 +01:00

objects

Merge pull request #7156 from PsiOmegaDelta/RadioFix

2014-11-30 00:56:53 +03:00

turfs

Fixes and guards against strange values

2014-11-25 20:01:30 +00:00

vehicles

…

verbs

Chat tags for OOC and LOOC.

2014-11-28 11:15:53 +01:00

asteroid.dm

…

atoms_movable.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

atoms.dm

Examining robomodules.

2014-11-21 19:28:46 +03:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30