Remie Richards da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances ...

Conflicts:
	code/game/atoms.dm

2016-04-06 21:26:46 +01:00

..

ai

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

pai

- I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)

2016-02-07 18:50:18 +01:00

robot

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

2016-04-03 18:22:20 -06:00

death.dm

Created two new procs to handle reviving mobs more easily:

2016-02-16 23:27:08 +01:00

laws.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

login.dm

Hand of God Fixes/Tweaks

2015-11-07 15:25:28 -03:00

say.dm

Dead cyborgs no longer get binary messages twice

2016-03-09 22:45:24 -05:00

silicon.dm

Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg

2016-04-02 20:52:00 +01:00