Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

..

admin

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

alarm

…

assembly

Runtime fixes.

2015-12-01 18:07:50 -05:00

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

blob

Prevents blob from growing over asteroid walls

2015-12-16 21:01:41 +01:00

client

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

clothing

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

economy

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

events

Clarification on mercenary shuttle approaching message, and fixes typo on text when the drone event ends.

2015-12-22 05:03:57 -05:00

examine

Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches.

2015-12-14 15:43:53 -05:00

ext_scripts

Makes changes to allow IRC bot output at Sparky's request.

2015-12-11 19:58:05 +00:00

flufftext

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

food

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

games

…

genetics

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

ghosttrap

Replaces :b with #b whenever a synthetic mob joins the game.

2015-12-03 14:02:56 -05:00

holodeck

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

hydroponics

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

icon generation

…

library

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

lighting

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-18 08:51:10 +02:00

liquid

…

maps

…

materials

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

mining

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

mob

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

multiz

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

nano

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-12-08 08:09:37 +01:00

organs

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

overmap

More computer overlay changes.

2015-08-20 08:38:43 +02:00

paperwork

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

power

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

projectiles

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

random_map

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

reagents

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

recycling

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

research

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

scripting

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

spells

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

supermatter

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

surgery

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2016-01-20 08:01:14 +10:30

tables

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

vehicles

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

virus2

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

xgm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-12-06 11:34:36 +01:00