Cameron653 36ef5e381c Merge remote-tracking branch 'refs/remotes/VOREStation/master'

2016-05-23 14:06:08 -04:00

..

admin

Added Change CKey Admin Verb

2016-05-20 20:43:36 -04:00

alarm

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

assembly

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

awaymissions

Issue #23 - Ported the carpfarm and listeningpost away mission maps (#96)

2016-05-17 20:35:28 -04:00

blob

…

client

Merge pull request #124 from VOREStation/heatfix

2016-05-21 13:20:12 -04:00

clothing

Adds nudity permit

2016-05-21 00:25:36 -04:00

customitems

…

detectivework

Fixes #1644

2016-05-19 11:22:52 -04:00

economy

Removes pay bugfix

2016-05-23 14:06:06 -04:00

events

Generic Station & System Name

2016-05-16 16:21:17 -04:00

examine

Generic Station & System Name

2016-05-16 16:21:17 -04:00

ext_scripts

…

flufftext

…

food

…

games

Generic Station & System Name

2016-05-16 16:21:17 -04:00

genetics

…

ghosttrap

…

holodeck

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

hydroponics

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

icon generation

…

library

Construction Update

2016-03-25 16:02:36 -04:00

lighting

…

maps

…

materials

Reinforced Walls

2016-04-15 16:41:33 +02:00

mining

Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync

2016-05-19 23:52:00 -04:00

mob

Merge pull request #195 from VOREStation/Dev-AceMobs

2016-05-23 08:16:54 -04:00

multiz

…

nano

HTML5 and CSS3 (#1677)

2016-05-19 14:28:38 -04:00

organs

Fixes synths and sets null post-load prefs

2016-05-18 01:36:14 -04:00

overmap

…

paperwork

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

power

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

projectiles

Updates flashbangs and flash/flare rounds to take advantage of new lighting.

2016-05-12 16:21:39 +01:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

reagents

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync

2016-05-18 10:13:26 -04:00

recycling

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

research

Removes pay bugfix

2016-05-23 14:06:06 -04:00

scripting

…

security levels

Construction Update

2016-03-25 16:02:36 -04:00

shieldgen

…

shuttles

…

spells

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

supermatter

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

surgery

Fixes beating people up during surgery

2016-05-18 22:59:05 +01:00

tables

…

vehicles

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

virus2

Fixes #1171

2016-03-21 14:22:44 +03:00

vore

Fixes Issue #146 - Fix wrapping of belly buttons in vore panel if they exceed width of vore panel window.

2016-05-21 20:09:29 -04:00

xgm

…