Mloc 6bfdbdd606 Merge pull request #1898 from SniperYeti/master ...

Security Belt Modifications (Added the stuff I missed)

2012-11-10 01:15:26 -08:00

..

ATMOSPHERICS

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-22 20:15:05 +10:00

controllers

TG fix for voting window not going away.

2012-11-03 08:04:47 +04:00

datums

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-11-09 14:32:49 +04:00

defines

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme

2012-11-03 12:21:54 +10:00

FEA

Fix for borked atmos on away missions. This may still need some further tweaking, but it definitely fixes the issue. I looked at the powernet issue too, but I couldn't reproduce it anymore. Maybe it's fixed.

2012-10-16 02:08:51 +00:00

game

Update code/game/objects/items/weapons/storage/belt.dm

2012-11-09 19:36:12 -05:00

js

…

modules

Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE.

2012-11-09 22:30:38 -07:00

TriDimension

…

unused

…

WorkInProgress

Made limbs prepeared for replacement stop hurt.

2012-11-09 18:07:02 +04:00

ZAS

some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug

2012-10-27 23:39:17 +10:00

global.dm

mergefixes, misc

2012-10-21 00:11:01 +10:00

hub.dm

…

names.dm

…

setup_3d.dm

…

setup.dm

RIGs have heat resist.

2012-10-28 23:39:50 +00:00

stylesheet.dm

Changed Command Channel color to more visible one.

2012-11-06 21:23:58 +04:00

world.dm

updated configs on MLoc's request.

2012-11-07 20:35:02 +04:00

ZAS_defines.dm

…