PsiOmega 02717d263a Fixes #6609, supplements #6610 ...

Haphazardly adds a cell charger and normal recharger to the vox skipjack, along with an extra screwdriver.
Vox and Syndicate armor siemens coefficient changed to match ERT.
Replaced all mapped instances of the stunbaton to loaded variants. Gave people on the Research Outpost a way to recharge their baton.

2014-10-07 15:05:41 +02:00

..

__HELPERS

Merg resolution.

2014-10-02 02:33:06 +09:30

_onclick

Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev

2014-10-02 02:39:37 +09:30

ATMOSPHERICS

Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite

2014-10-01 06:06:10 +09:30

controllers

Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite

2014-10-01 06:06:10 +09:30

datums

Cargo can now order body/stasis bags.

2014-10-06 08:09:28 +02:00

defines

Fixes #6575 and a few other issues

2014-10-02 20:22:01 +02:00

FEA

…

game

Merge pull request #6618 from Zuhayr/dev

2014-10-06 16:36:30 -07:00

js

…

modules

Fixes #6609, supplements #6610

2014-10-07 15:05:41 +02:00

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

unused

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

2014-09-10 22:14:37 +01:00

WorkInProgress

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

ZAS

Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev

2014-10-02 02:39:37 +09:30

global.dm

Non-drone silicons now have access to a basic security xor medical hud.

2014-08-28 20:01:43 +02:00

hub.dm

…

names.dm

…

setup.dm

Moved radiation and light processing to organs.

2014-09-30 11:58:40 +09:30

stylesheet.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

world.dm

…