Zuhayr 36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-01-22 01:33:09 +10:30

..

admin

Cleaning up post-merge.

2016-01-22 01:22:49 +10:30

alarm

…

assembly

…

awaymissions

…

blob

Prevents blob from growing over asteroid walls

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

client

Cleaning up post-merge.

2016-01-22 01:22:49 +10:30

clothing

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

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

customitems

…

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

…

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

…

holodeck

…

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

…

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 'master' of https://github.com/PolarisSS13/Polaris

2016-01-22 01:33:09 +10:30

multiz

Tweaks to previous commits.

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

nano

…

organs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-01-22 01:33:09 +10:30

overmap

…

paperwork

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

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

power

Cleaning up post-merge.

2016-01-22 01:22:49 +10:30

projectiles

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-01-22 01:33:09 +10:30

random_map

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

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

reagents

Cleaning up post-merge.

2016-01-22 01:22:49 +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

…

security levels

…

shieldgen

…

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

…