phil235 74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation ...

Conflicts:
	code/modules/mob/living/living.dm

2014-11-04 18:55:07 +01:00

..

area

Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam

2014-10-25 23:25:27 -07:00

gamemodes

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

2014-11-04 18:55:07 +01:00

jobs

Players jobbanned from assistant will get random jobs assigned before everyone else, in order to attempt to mitigate abuses.

2014-10-27 16:20:11 -03:00

machinery

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

2014-11-04 18:55:07 +01:00

mecha

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

2014-11-04 18:55:07 +01:00

objects

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

2014-11-04 18:55:07 +01:00

pooling

…

turfs

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

2014-11-04 18:55:07 +01:00

verbs

Makes pull into a mob verb.

2014-10-27 12:28:06 -03:00

asteroid.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

atoms_movable.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

atoms.dm

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

communications.dm

…

data_huds.dm

…

dna.dm

* Prevent being able to open/close sleepers, cryo tubes and DNA scanners when in various conditions (weaken, ...) and by non-humans/non-silicons.

2014-11-01 21:52:54 +01:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…