Commit Graph

19017 Commits

Author SHA1 Message Date
d3athrow
e585a08b3e Merge pull request #5428 from PJB3005/FULL-OF-SHIT
Reverts DAL.
2015-07-22 19:25:25 -05:00
D3athrow
7340cd09fb soiled it 2015-07-22 19:25:18 -05:00
clusterfack
4359258f68 Merge pull request #5466 from clusterfack/beams
Fix beams
2015-07-22 07:49:41 -05:00
clusterfack
f810233540 Fix beams
There is a very good chance this will fix infinite beam recursion. Without a list of children or sources, and with re-emission this could likely becausing the infinite loops.
2015-07-22 07:38:22 -05:00
clusterfack
9d80e23449 Merge pull request #5390 from PJB3005/time-to-run
should fix the runtimes
2015-07-22 06:43:51 -05:00
clusterfack
3491a7d635 Merge pull request #5455 from Intigracy/5302
Fixes #5302 (Helmets now hide hair)
2015-07-22 06:43:16 -05:00
clusterfack
f509787b95 Merge pull request #5457 from Intigracy/4847and4538
Fixes #4847 (Vox dart guns now allow loading of beakers)
2015-07-22 06:42:51 -05:00
clusterfack
176854649d Merge pull request #5450 from clusterfack/mobpoolingsomeday
Resetvariables
2015-07-22 06:42:42 -05:00
Intigracy
5dce72b1a9 Fixes #4847
Fixes #4538
2015-07-22 01:05:04 -07:00
Intigracy
ba965ddf22 Fixes #5302 2015-07-22 00:56:38 -07:00
clusterfack
39535c588d Resetvariables
Fixes list() resetVariables for various mobs
2015-07-21 22:21:23 -05:00
D3athrow
506f971ae6 fuck you nanoui hello annoying htmlui 2015-07-21 22:06:32 -05:00
clusterfack
556034f98b Merge pull request #5449 from Unfit/signs
[hotfix]Reverts picket signs
2015-07-21 19:58:16 -05:00
Unfit
ac4298cd47 Revert "picket signs 1"
This reverts commit 87ef4e5ed5.
2015-07-22 02:21:12 +02:00
Unfit
b844757868 Revert "test"
This reverts commit 1831f9dc83.
2015-07-22 02:21:07 +02:00
D3athrow
245d35a3a3 Logging for 'bad' airlock topic calls. 2015-07-21 19:09:59 -05:00
PJB3005
3bc5d86263 LIGHTING IS BACK.
AND A SHITLOAD FASTER.

SANIC.
2015-07-21 14:16:27 +02:00
D3athrow
54a563cb0d fix #5400 2015-07-21 00:38:55 -05:00
D3athrow
cb893e342e borgs cant leave their beaker in a thing and walk away 2015-07-21 00:12:14 -05:00
D3athrow
fa697178dc fix #5395 2015-07-20 20:29:17 -05:00
D3athrow
716da08594 fix #5393 2015-07-20 20:21:24 -05:00
D3athrow
9e209a3716 should fix #5373 2015-07-20 19:08:56 -05:00
D3athrow
cef142f3a0 Fix #5410 2015-07-20 19:01:54 -05:00
D3athrow
ea38eeff60 Fix #5436 also somebody should redo this, no sense in remaking things constantly intead of just storing the hook and actual lantern. 2015-07-20 18:58:07 -05:00
D3athrow
ced88eba93 Fixes #5429 apcs being lewd 2015-07-20 18:41:14 -05:00
D3athrow
e0bb94d478 bandaid 2015-07-20 18:22:34 -05:00
D3athrow
cf333c09e7 FFUUUUUUUUUUUUUUUUUUUUUUUUUUUUCCCKKK 2015-07-20 16:04:58 -05:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
2867574f47 Fix #5426
I somehow let this sit for 16 hours and never pushed it, what the fuck is wrong with me
2015-07-20 02:50:09 -05:00
D3athrow
f545aed710 fix dem crashums 2015-07-19 11:22:55 -05:00
D3athrow
63d1c07ffc we need mo 2015-07-19 01:23:24 -05:00
D3athrow
2cda2b611f what 2015-07-18 23:40:42 -05:00
D3athrow
d8a82d40b1 panic writer 2015-07-18 23:06:57 -05:00
D3athrow
7a3ff4efc3 THE LIGHTING IS DEAD, LONG LIVE DAL 2015-07-18 23:05:18 -05:00
D3athrow
a5940b1b3c Fix erroneous additions/renames/case changes 2015-07-18 15:12:04 -05:00
D3athrow
7b07afb3fc fix #5411 2015-07-18 14:33:33 -05:00
d3athrow
f01cf6e1a8 Merge pull request #5181 from Unfit/signs
Adds picket signs
2015-07-18 12:30:00 -05:00
PJB3005
4d8ef3859f Makes the map writer readable.
Also adds a filter system.
2015-07-18 16:25:54 +02:00
PJB3005
3f39341c96 Removed the rocks. 2015-07-18 14:05:57 +02:00
clusterfack
c0be34f456 Merge pull request #5409 from clusterfack/araara
Fix #5406
2015-07-18 05:22:38 -05:00
clusterfack
b7104359c9 Fix #5406
Only one of these caused an issue, but I think all four had the potential to
2015-07-18 05:10:22 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
clusterfack
edd7ea94da Fix strangerocks
The reference to the inner object wasn't nulled before being before the strangerock was being deleted, therefore it was getting deleted too.
2015-07-18 01:20:16 -05:00
ComicIronic
cc0fdaca02 Bugfixing.
Fixes #4903, one check was accidentally not.
Fixes #4385, C4 is now removed from overlays regardless of success.
Fixes #4902, throwing an offhand now makes you throw the main hand instead.
Fixes #4914, Ian now checks for Adjacency before tucking in.
Tries #5112, spell objects should now remove refs properly.
Fixes #5121, all put_in_hand code now checks that the item can be held.
Fixes #5151, designs with no materials now make their own again.
Fixes #5199, money bags now use cointype instead of stupid path code.
Fixes #5208, the dropped cable coil after a shock is now only 1 long.
Fixes #5278, now only mapped telesci consoles start with a cell.
Fixes #5306, coins on a string are now no longer placed into the coinbox if pulled out.
Fixes #5367, MoMMIs can now have their wires fiddled with and can be deconstructed.
2015-07-18 02:16:57 +01:00
clusterfack
dbd28d4f05 Merge pull request #5391 from Arthurdentist/syndiebundles
Fixed Grand Prize Syndicate Bundle so it doesn't spawn empty
2015-07-17 15:36:04 -05:00
clusterfack
fbf8bf7823 Merge pull request #5389 from Kurfursten/fixnewscaster
Fixes #5301
2015-07-17 15:35:38 -05:00
clusterfack
3a2b72af48 Merge pull request #5376 from clusterfack/INTOTHETRASHITGOES
Removes more manual del() calls
2015-07-17 15:35:14 -05:00
clusterfack
0847c30ed2 Merge pull request #5375 from clusterfack/jaunt
Improves jaunt
2015-07-17 15:35:03 -05:00
Arthurdentist
26efd58a68 Fixed balloon bundle
pickweight hates decimal places so the weighted chance of everything
gets increased to hundred and chance of balloon bundle gets raised to
one, so the balloon bundle spawns properly but is also the rarest single
bundle.
2015-07-16 23:02:29 +01:00
PJB3005
5a615e0029 should fix the runtimes 2015-07-16 23:33:31 +02:00