jack-fractal 29bffb0c20 Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

2013-06-06 21:32:08 -04:00

..

area

Bar / Holodeck / Theatre / Hydroponics Revamp

2013-05-29 20:24:29 -07: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

Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

machinery

Map conflict, using BEF.

2013-06-06 10:40:22 +09:30

magic

…

mecha

Changes on how some simple hostile mobs search for targets, they now make a list of mobs at sight with the heareable() proc and add the mechs of a new global list instead of checking all the atoms in a radius of 21x21.

2013-06-04 14:09:05 +04:00

objects

Merge branch 'master' into bleeding-edge-freeze

2013-06-06 21:32:08 -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

…

atoms.dm

Showed that huge proc in /atom what polymorphism' is.

2013-06-01 12:24:43 +04: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

…

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