Ccomp5950
8691d36ea1
Merge pull request #6062 from PsiOmegaDelta/Walls
...
Optimization - Walls deletion
2014-08-19 06:22:31 -05:00
Ccomp5950
cf2be93916
Merge pull request #6056 from mwerezak/dev-fixes
...
Fixes firedoors not opening
2014-08-19 06:02:08 -05:00
PsiOmega
b3cd08068a
Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.
2014-08-19 10:50:17 +02:00
mwerezak
f6f7c82e2a
Fixes firedoors not opening
2014-08-18 22:53:43 -04:00
Zuhayr
df6723deb0
Merge pull request #6036 from mwerezak/power-net
...
Fixes laptop power draw, improves cell chargers
2014-08-18 21:04:02 +09:30
Zuhayr
2a6a312dbe
Merge pull request #6019 from mwerezak/radio
...
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
2014-08-18 09:25:24 +09:30
Zuhayr
4e862ec9a7
Merge pull request #6014 from comma/spacearea
...
Replaces /area with /area/space
2014-08-18 09:21:44 +09:30
mwerezak
6d6413a59b
Fixes laptop power draw, improves cell chargers
...
Cell chargers no longer call use_power() in their process()
2014-08-17 15:30:29 -04:00
mwerezak
3c46e4c35b
Fixes airlocks aborting when cycled
...
Fixes airlocks aborting because the doors took too long to close.
2014-08-16 14:39:37 -04:00
Chinsky
72fed65b10
Merge pull request #6011 from PsiOmegaDelta/BrigTimers
...
Unstationary cell status displays now fixed
2014-08-16 10:44:59 +04:00
Chinsky
1de0e2cb44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea
...
Conflicts:
maps/tgstation2.dmm
2014-08-16 06:29:55 +04:00
Chinsky
03cdfaf896
Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.
2014-08-16 05:28:45 +04:00
mwerezak
d4218e7cd7
Allows airlock access buttons to use ID in hand
2014-08-15 21:01:33 -04:00
Chinsky
f71e43d06c
Moved ambiance sounds out of horrendous ifchain to area definitions.
...
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
mwerezak
9d7c5dc197
Gives filters proper names, updates airlocks to use filters
...
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
mwerezak
edd7a718b2
Moves the radio controller to the controllers dir
2014-08-15 17:05:51 -04:00
Raptor1628
75e63e55a4
More Fixes
...
Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
2014-08-15 12:25:56 -04:00
PsiOmega
30cb1a32fb
No more auto-adjustment of cell status displays.
2014-08-15 08:55:55 +02:00
Raptor1628
f1c44601e5
Brig Fixes
...
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
PsiOmega
6fffe8e077
Merge remote-tracking branch 'upstream/dev' into Brig2
2014-08-14 08:58:59 +02:00
Chinsky
658941a0f9
Merge pull request #5978 from Zuhayr/journalism
...
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04:00
Zuhayr
43a7757252
Merge pull request #5982 from Jarcolr/customs
...
Adds the cigar case as a premium cigarette vending machine item.
2014-08-14 12:02:49 +09:30
Chinsky
af9f56f164
Merge pull request #5969 from GinjaNinja32/floortiles
...
Adds floor painter.
2014-08-14 06:31:09 +04:00
Chinsky
abc587b64c
Merge pull request #5971 from Lancer411/dev
...
Fix for infinite loop in smokeFlow() proc.
2014-08-14 06:31:06 +04:00
Chinsky
1c5e944ce5
Merge pull request #5954 from Zuhayr/dev
...
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
Jarcolr
6c807199c9
Adds the cigar case as a premium vending item
...
5 may be a bit too much, but who is going to get all those coins,
anyway?
2014-08-13 12:10:43 +03:00
GinjaNinja32
7b7f526903
Fixes being able to use the floor painter through windows, windoors etc.
2014-08-13 09:30:11 +01:00
Zuhayr
688cf22a67
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-13 17:10:37 +09:30
PsiOmega
2a46b83dce
Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928
2014-08-13 09:35:04 +02:00
Lancer411
2882576358
Fix for infinite loop in smokeFlow() proc.
...
When chemical grenade being activated on any unsimulated turf (for example a space turf), smokeFlow() starts infinite while loop, overloading the server.
With the only one unsimulated turf in pending list while() loop can't finish itself and for() loop can't start.
This fix makes chemical grenades being able to explode in space without server going in infinite loop.
Also fixed issue with smoke being able to pass through glass walls with help of c_airblock() proc. That's the best solution I could come up with.
Zone check code was useless because every single turf besides walls (which allready checked) and unsimulated turfs have it, making algorithm believe that turfs behind the glass wall are being reachable by chemsmoke.
I don't know if it was intended not to spread smoke in airless or unsimulated areas, but a bunch of airless simulated floor tiles in space is good enough for this algorithm to start spreading smoke around.
P.S. this algorithm is good for large, open areas and horrible in narrow maint tunnels. It is creating only a single cloud of smoke for 50/50/50 recipie in 1 tile wide tunnel.
2014-08-13 06:26:30 +08:00
GinjaNinja32
9abd6765b1
More floor tiles
2014-08-12 21:13:46 +01:00
GinjaNinja32
0493090f15
Add more floor tile types
2014-08-12 21:09:51 +01:00
GinjaNinja32
dcd5092f23
Add floor painter
2014-08-12 20:47:26 +01:00
Chinsky
7befe12950
Merge pull request #5965 from Lancer411/dev
...
Fixes for grid_check random event.
2014-08-12 21:55:38 +04:00
Zuhayr
3d16309444
Merge pull request #5956 from comma/optable
...
Optable changes
2014-08-13 00:46:21 +09:30
Lancer411
80305bc2fb
Checks for SMES Z level at power_failure.dm
...
Little fix which checks Z level of SMES before drying it up at grid_check event.
2014-08-12 22:05:28 +08:00
Lancer411
784b546e93
Fixes for grid_check random event.
...
There was an issue, when APC with removed cell in area was powered at power_restore() proc, making area allways powered despite APC was not working.
Removed part of code which unpowers area directly, bypassing the APC process code. This makes grid_check event less laggy and smooth. Downside is lights not being shut down immediatly.
AI SMES still not being affected after this fix.
2014-08-12 19:50:20 +08:00
Chinsky
37ad0e3c1c
Changed optable so it would not care why victim is lying down. It would only accept victim if it was resting, so sometimes it would not recognize lying mobs as valid victims, leading to lots of unfun in surgery.
...
Updated surgery helper to account for that, also cleaned it up a little with replacing all the possible causes of lying down with just lying check. It's all checked in can_move already.
2014-08-11 19:07:19 +04:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Zuhayr
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +09:30
Zuhayr
a2945a00d7
Merge pull request #5940 from mwerezak/power-net
...
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
Zuhayr
7c46a67551
Merge pull request #5949 from Ccomp5950/cult-tele
...
Summon cultist and free cultists runes now give cultists less damage
2014-08-11 10:13:12 +09:30
Zuhayr
9ec66acc90
Merge pull request #5936 from Walter0o/patch-3
...
fixes #5934 and teleport comp fix
2014-08-11 10:12:57 +09:30
Ccomp5950
06da9e8070
Merge pull request #5941 from Whitellama/master
...
Fixes #5577 , Dionaea crashing on death. Fixes #5838 , tomes not being able to be stored on bookshelves."
2014-08-10 18:53:11 -05:00
Ccomp5950
756b220bf3
Summon cultist and free cultists runes now give cultists less damage
...
Damage scales downward with each additional cultists around the rune.
No more automatic 15 damage for freedom then 25 for summoning even if you have 8 cultists helping with the ritual.
2014-08-10 18:26:58 -05:00
mwerezak
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
mwerezak
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
Whitellama
49c8c6f2cb
Made arcane tomes a subtype of books, fixes #5838
2014-08-10 02:23:36 -07:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6
Fixes #5935
...
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
