Commit Graph

25254 Commits

Author SHA1 Message Date
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
clusterfack
322dae29d1 Merge pull request #5404 from clusterfack/strangerock
Fix strangerocks
2015-07-18 01:30:55 -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
clusterfack
70de6fd986 Merge pull request #5392 from PJB3005/revert-5388-revert-5382-ignoring
Revert "Revert "Adds the CMC minimap files to the .gitignore""
2015-07-17 02:35:05 -05:00
PJB3005
a30c15f700 Revert "Revert "Adds the CMC minimap files to the .gitignore"" 2015-07-17 11:17:04 +02:00
d3athrow
61c62b5eb7 Merge pull request #5327 from Kurfursten/taxifix
Taxi Fix
2015-07-16 19:23:00 -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
Kurfursten
69cea1fdd2 Such is life 2015-07-16 16:19:32 -05:00
clusterfack
9dc971d557 Merge pull request #5388 from d3athrow/revert-5382-ignoring
Revert "Adds the CMC minimap files to the .gitignore"
2015-07-16 16:17:23 -05:00
clusterfack
66a75ee72b Merge pull request #5383 from PJB3005/autolathes
Should fix the autolathe eating stacks if you specify 0 as amount.
2015-07-16 16:06:19 -05:00
clusterfack
d59cb2dc3e Merge pull request #5382 from PJB3005/ignoring
Good point
2015-07-16 13:50:55 -05:00
PJB3005
12410d8dc8 Should fix the autolathe eating stacks if you specify 0 as amount. 2015-07-16 19:48:00 +02:00
PJB3005
0f50da9fd1 Adds the CMC minimap files to the .gitignore 2015-07-16 19:15:31 +02:00
clusterfack
c1dc60696c Revert "Adds the CMC minimap files to the .gitignore" 2015-07-16 11:17:16 -05:00
clusterfack
6293688af9 Removes more manual del() calls
-Lots of things
-They all call delete
-Lots call spawn() unnecessarily
-They should garbage collect or be pooled now
2015-07-16 00:54:24 -05:00
clusterfack
95a29b19fe Improves jaunt
-No longer causes 2 deletions!
-You can now see yourself while jaunting! Spoopy 125 alpha, ghost style so you know you are jaunting!
-Fuck you copypasted vampire mist proc!
-Uses standard procs for animations
-Options to enable/disable mist, change animation type
2015-07-15 22:22:42 -05:00
D3athrow
0ab3a11989 disable fancy shading 2015-07-15 19:54:44 -05:00
D3athrow
de6bd1fd69 remove unneeded list while using the stack recipe datums 2015-07-15 15:52:00 -05:00
d3athrow
e08b54ced3 Merge pull request #5371 from PJB3005/compile
Fixes the compile
2015-07-15 11:53:03 -05:00
PJB3005
ab272dd9c3 Fixes the compile 2015-07-15 18:18:20 +02:00
d3athrow
471efb29a1 Merge pull request #5281 from PJB3005/just_what
Removes setLoc(), a retarded piece of code
2015-07-15 11:14:21 -05:00
d3athrow
ae21b31009 Merge pull request #5356 from PJB3005/plspomf
Implements another lighting optimization from bay.
2015-07-15 08:31:39 -05:00
clusterfack
523e1eaf24 Merge pull request #5342 from clusterfack/FUCKYOUSAYLAGGYSAYCODE
SHOVE IT IN ONII-SAMA
2015-07-14 18:28:42 -05:00
D3athrow
259ed4d32c fug 2015-07-14 18:17:59 -05:00
D3athrow
b860f7caf9 FUCKFUCKFUCKFUCKFUCKFUCKFUCK 2015-07-14 17:58:04 -05:00
d3athrow
b1b3fa2397 Merge pull request #5368 from Arthurdentist/spritefix
Fixes  #5313
2015-07-14 16:36:16 -05:00
d3athrow
4b7a0b3026 Merge pull request #5369 from PJB3005/href_exploiter_babysitting
recycling console ID fixed
2015-07-14 16:31:16 -05:00
D3athrow
7fdb6e3d63 yay sorta oop maybe 2015-07-14 16:30:04 -05:00
clusterfack
53b4182eef Optimizes Say
I dunno make say code faster or something
2015-07-14 16:20:52 -05:00
PJB3005
a5f53b645d recycling console ID fixed 2015-07-14 23:00:14 +02:00
clusterfack
51d8fdd23e Thanks chikun 2015-07-14 15:41:53 -05:00
Arthurdentist
d51bc4cd6b Fixes #5313 2015-07-14 21:03:01 +01:00
clusterfack
4035505b01 Merge pull request #5365 from clusterfack/cmc2
Correction
2015-07-13 23:45:45 -05:00
clusterfack
3e66fa4bdd Correction
CMC offset applies to GPS coords, but NOT minimap coordinates
2015-07-13 23:37:30 -05:00
clusterfack
6919cf2d9c Merge pull request #5364 from clusterfack/ivanttosuckyourblawd
Fix blood issues further
2015-07-13 21:42:45 -05:00
clusterfack
7b796d465c Merge pull request #5336 from Arthurdentist/potentham
Potent Hams
2015-07-13 21:41:46 -05:00
clusterfack
31d515c9f4 Merge pull request #5353 from PJB3005/gotta-go-fast
Conveyors now gotta go fast!
2015-07-13 21:41:36 -05:00
Arthurdentist
49a0c32bb9 Closed potential exploit 2015-07-14 03:22:48 +01:00
clusterfack
a989427910 Fix blood issues further
Yeah lots of things depend on the assumption that blood_dna is null or a list. I've fixed up several more, this should fix human icons.
2015-07-13 20:11:32 -05:00
clusterfack
552c4d628c Merge pull request #5288 from Kurfursten/spsfix
SPS Fix
2015-07-13 19:48:19 -05:00
clusterfack
544a6187f7 Merge pull request #5361 from clusterfack/midnight
Add midnight rollover to station time
2015-07-13 19:45:53 -05:00
clusterfack
a3fc70523a Merge pull request #5362 from clusterfack/crewmonitor
Fixes CMC coord drift
2015-07-13 19:45:44 -05:00
clusterfack
6a663bf468 Merge pull request #5344 from NigglyWiggly/Megabusters
Megabusters
2015-07-13 19:45:37 -05:00
clusterfack
a11f44d45b Fixes CMC coord drift
Readds our local zlevel drift system to the CMC so it gives accurate coordinates. That is to say, not accurate but consistent with everything else.
2015-07-13 14:36:29 -05:00
clusterfack
e4084756dc Add midnight rollover to station time
Fixes #5329
2015-07-13 14:27:10 -05:00