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

Conflicts:
	html/changelog.html

2013-05-31 22:58:01 -05:00

..

area

Squashed commit of the following:

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

gamemodes

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

2013-05-31 22:58:01 -05:00

jobs

Cobpipe fix

2013-05-31 00:21:48 -05:00

machinery

Fixing twice defined attackby().

2013-05-31 12:47:53 +03:00

magic

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

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

mecha

Squashed commit of the following:

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

objects

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

2013-05-31 22:58:01 -05:00

structure

…

turfs

Squashed commit of the following:

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

vehicles

…

verbs

Removed non-antag chars suicide verb.

2013-03-11 00:38:40 +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

Squashed commit of the following:

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

communications.dm

Squashed commit of the following:

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

dna.dm

Squashed commit of the following:

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

hud.dm

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

2013-01-31 14:26:58 -08:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

added "back" button to go back to last viewed menu for cargo bay computers

2013-03-06 18:45:38 +10:00