comma 138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.

2012-08-08 13:21:47 +04:00

..

ATMOSPHERICS

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

2012-07-04 09:00:59 +01:00

datums

Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.

2012-07-31 01:14:14 -04:00

defines

uncommented some missing supply datums

2012-08-05 02:21:45 +10:00

FEA

Working UL

2012-06-18 15:02:34 -07:00

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-08-08 13:21:47 +04:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-08-08 13:21:47 +04:00

unused

modified: code/modules/mob/living/silicon/ai/say.dm

2012-07-17 14:26:36 -05:00

WorkInProgress

various tweaks to energy fields, energy field artifacts (some outstanding bugs still)

2012-08-06 05:13:02 +10:00

ZAS

Runtime fix

2012-08-03 14:08:07 -07:00

access_defines.dm

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

names.dm

…

setup.dm

ZAS fixes.

2012-07-26 11:56:00 -07:00

stylesheet.dm

Fixes Mods being able to use Subtle messages. Fixes mod panel. Prevents mods from seeing stealthed admins in various places. Fixes mods seeing gibbed messages. Changed colours to be more readable, mod say is now brown.

2012-06-02 21:17:37 +01:00