cib f424a2c4c0 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature ...

Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/hostile/giant_spider.dm

2013-02-10 23:07:55 +01:00

..

area

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

events

Fix for issue #2103

2013-01-10 03:10:12 +04:00

gamemodes

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

2013-02-10 23:07:55 +01:00

jobs

Fixed typo in AttoUrney's job.

2013-02-07 21:47:56 +04:00

machinery

Fixed issue with newscaster channels not working with ' in them.

2013-02-07 21:48:40 +04:00

magic

Good God, cult code is atrocious....

2013-01-11 02:01:23 +04:00

mecha

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

objects

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

structure

cleaned up a bunch of away missions, made only the peaceful-ish ones spawn, added my jungle map and susu's research labs map

2013-01-11 14:52:43 +10:00

turfs

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

vehicles

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

verbs

Now rest of admin ranks will at least have OOC.

2013-01-28 01:22:58 +04:00

asteroid.dm

…

atoms_movable.dm

Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.

2013-01-20 10:45:20 +00:00

atoms.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

communications.dm

You can now make a single camera use multiple networks.

2013-01-22 01:24:09 +00:00

dna.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

hud.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Can order contraband crates.

2013-01-28 18:07:34 +04:00