Segrain fe0e1ecfb6 Conflict fix?

2013-07-25 09:55:35 +03:00

..

area

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

gamemodes

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

2013-07-22 14:42:50 +01:00

jobs

moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime

2013-07-12 03:40:06 +10:00

machinery

Changed the list of p_stats available in medical records

2013-07-22 15:10:25 -04:00

magic

…

mecha

Conflict fix?

2013-07-25 09:55:35 +03:00

objects

Added engineering tape roll to CE closet.

2013-07-24 07:27:06 -07:00

structure

…

turfs

Merge branch 'bleeding-edge-freeze' into viro

2013-07-09 12:49:23 +04:00

vehicles

…

verbs

Fixes #3225. Adds separate toggle for LOOC.

2013-07-10 22:39:27 +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

Examine() update.

2013-06-28 03:33:06 +03:00

communications.dm

ERT Radio fix (For real)

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

dna.dm

Alien Monkeys - Farwa, Stok, Aenera

2013-06-14 02:22:27 -04:00

hud.dm

…

json.dm

…

response_team.dm

Made it so auto- and admin-ERT crosscheck each other

2013-07-22 16:53:48 -04: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