Chinsky bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2013-06-12 23:11:28 +04:00

..

area

Medbay Remap post-ERT

2013-06-12 23:27:36 +10:00

gamemodes

Items for wizard den, mental focus added to spellbook.

2013-06-10 14:56:47 -07:00

jobs

Adds "Xenobiologist" as its own separate job

2013-06-10 21:45:07 -04:00

machinery

Merge resolution.

2013-06-12 20:31:29 -07:00

magic

Non-animated runes aren't being cached, probably a bug.

2013-02-19 23:40:06 -05:00

mecha

Fixes an issue in grammar!

2013-06-09 03:40:27 -04:00

objects

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

2013-06-12 23:11:28 +04:00

structure

…

turfs

Added bloody footprints.

2013-06-01 14:30:05 +04:00

vehicles

…

verbs

Removed non-antag chars suicide verb.

2013-03-11 00:38:40 +04:00

asteroid.dm

…

atoms_movable.dm

Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)

2013-06-10 22:35:01 -07:00

atoms.dm

Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)

2013-06-10 22:35:01 -07:00

communications.dm

ERT Radio fix (For real)

2013-06-02 01:29:50 -04:00

dna.dm

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

hud.dm

…

json.dm

…

response_team.dm

Amending a previous fix due to new ERT code from bef.

2013-06-12 20:47:04 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Fix for ordering hidden supplypacks.

2013-06-09 10:25:27 +03:00