comma ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze ...

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

2013-07-09 12:48:34 +04:00

..

__HELPERS

whoops

2013-07-01 19:50:06 +04:00

ATMOSPHERICS

…

controllers

Removes visible tallies from votes.

2013-07-07 02:42:28 -07:00

datums

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

defines

Actually rectifies issue #3182, by making the activity list be based on the physical status (p_stat) in the records instead of an automated activity checker.

2013-07-02 16:14:06 -07:00

FEA

…

game

Merge branch 'master' into bleeding-edge-freeze

2013-07-09 12:48:34 +04:00

js

…

modules

Merge branch 'master' into bleeding-edge-freeze

2013-07-09 12:48:34 +04:00

TriDimension

…

unused

…

WorkInProgress

Reverts my firechanges, also air alarms now have a temperature regulation capacity.

2013-07-04 20:55:59 -07:00

ZAS

changed how fire works

2013-07-05 19:56:53 +01:00

global.dm

Space Ninja Gamemode Implementation

2013-06-22 00:19:32 -07:00

hub.dm

…

names.dm

…

setup.dm

Now 100% more machinery!

2013-07-05 04:12:41 +04:00

stylesheet.dm

…

world.dm

…