Commit Graph

21281 Commits

Author SHA1 Message Date
Razharas
a2bcbf5db7 Merge pull request #13279 from tkdrg/PUTTING_YOUR_VARS_IN_A_POOL
Ports the /vg/ pooling resetVars by Clusterfack
2015-11-29 23:36:07 +03:00
Remie Richards
edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334
0048a5b2a7 Fuck this, fuck you 2015-11-29 14:10:46 -05:00
as334
dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt
a4151bb212 Merge pull request #13280 from Anonus/mmbuff
Fixes inflict_handler spells not doing burn damage in some cases
2015-11-29 12:36:18 -06:00
duncathan salt
aa7df92150 Merge pull request #13282 from Anonus/fluxfix
Fixes flux and gravitational anomalies not shocking nondense mobs
2015-11-29 12:35:30 -06:00
duncathan salt
a9cfc6eb8a Merge pull request #13288 from AnturK/topicfix
Fixes AI canUseTopic
2015-11-29 12:35:03 -06:00
duncathan salt
f7eae879d2 Merge pull request #13004 from Shadowlight213/mobbuffs
buffs syndicate simple mobs
2015-11-29 12:33:09 -06:00
duncathan salt
9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Nerd Lord
fba1c1129a fine, fine fuck okay sure
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
Kyle Spier-Swenson
59963b89b5 quant --> quaint 2015-11-29 08:00:33 -08:00
MrStonedOne
921c9eede1 Asset cache Fixes
Fixes asset cache locking up the MC initialization at world start.
Fixes asset cache not pre-loading resources to clients that connect from a world reboot.
Fixes a null reference runtime relating to the client disconnecting at the wrong time (I still conciser this to be a byond bug)
Fixes crew monitor registering assets because they exist
Fixes crew monitor trying to send zlevel assets for zlevels it hasn't processed.
Fixes nano ui sometimes not sending the template asset to the client on open.
2015-11-29 07:19:49 -08:00
Jordie
fd96c313a7 Merge pull request #13248 from bgobandit/dominatorfix
Fixes dominator error message issue.
2015-11-29 21:08:38 +11:00
Jordie
e9ea0d8dc9 Merge pull request #13275 from swankcookie/snowman
Adds Snowman costume
2015-11-29 21:08:11 +11:00
Jordie
3fce4f80be Merge pull request #13246 from KorPhaeron/stop_getting_shot_godamn
Allows you to forcibly recall your guardian/parasite
2015-11-29 21:07:29 +11:00
Jordie
aa672d3e95 Merge pull request #13230 from JJRcop/i12317
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
Jordie
ce5d74ef07 Merge pull request #13221 from MrStonedOne/patch-69
Changes event fire rate from 5-15 minutes to 3-10 minutes
2015-11-29 21:07:03 +11:00
Jordie
56c2659736 Merge pull request #13187 from ktccd/master
Fixes areas blobs shouldn't win from spreading to.
2015-11-29 21:06:46 +11:00
Jordie
38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Jordie
06134d5f19 Merge pull request #13104 from GunHog/OfTeleportsAndNames
Hand Tele now displays its destination.
2015-11-29 21:06:01 +11:00
Jordie
97a3b3f3c7 Merge pull request #13097 from RemieRichards/patch-2
Updates Holopad code to use AltClick
2015-11-29 21:05:50 +11:00
Jordie
7b1a92885c Merge pull request #13024 from TheNightingale/Nighting
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
Jordie
ee3e5c4d3f Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade
Adds Light Replacer Refilling With Box of Lights
2015-11-29 21:04:43 +11:00
Shadowlight213
2247efb278 Adds armor penatration. 2015-11-29 01:59:22 -08:00
Razharas
4314b0924a Merge pull request #13203 from Incoming5643/g_absorbing_the_joke
Removes Accidental IC in OOC
2015-11-29 12:14:10 +03:00
Razharas
8f79afd900 Merge pull request #13236 from MrStonedOne/patch-71
Makes False Alarm only choose events that actually have alarms
2015-11-29 12:04:21 +03:00
Razharas
e0a14d899d Merge pull request #13267 from tkdrg/give_me_a_banjob_baby
Jobban cleanup & performance improvements
2015-11-29 12:00:01 +03:00
Razharas
2f0a221c8c Merge pull request #13276 from MrStonedOne/patch-74
Removes spawn(rand(10,150)) from client database syncing
2015-11-29 11:57:05 +03:00
as334
611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
duncathan salt
a5dfafd0d4 Merge pull request #13197 from MrStonedOne/revert-12977-reverttimedinjectors
Revert "Properly reverts timed injectors"
2015-11-28 22:46:36 -06:00
Cheridan
4a408a5cff Merge pull request #13237 from bgobandit/facehuggersfuck
Fixes facehugger-related bugs.
2015-11-28 21:08:37 -06:00
Cheridan
2abaa2b0f1 Merge pull request #13045 from KorPhaeron/laserbox
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
Nerd Lord
b926afc3ef Fixes rune code a little, the revival beam goes the right way now. 2015-11-28 21:24:17 -05:00
KorPhaeron
4245481019 Lower layer but still higher than it was 2015-11-28 18:48:42 -06:00
Nerd Lord
1e6bb6c29c Updates construct sprites for consistency.
This doesn't mean they have better lighting, just that they're consistent for the most part(sorry wj it's not that good)
2015-11-28 19:33:34 -05:00
PKPenguin321
8e09b00f2c Merged upstream 2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck
Mounted Chainsaw Inhands 2.0
2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d fixes everything
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
2015-11-28 14:57:36 -08:00
duncathan salt
123994bf8d Merge pull request #13290 from neersighted/nanoui_update
Fix up NanoUI states; add snowflake for Drones
2015-11-28 16:42:19 -06:00
AnturK
9a434b669c Academy Fixes 2015-11-28 23:17:57 +01:00
Bjorn Neergaard
5601eaf56e Fix Mixer NanoUI size 2015-11-28 17:16:20 -05:00
AnturK
4be6a64717 Fixes AI canUseTopic 2015-11-28 22:59:06 +01:00
Nerd Lord
33e6fe073e Cross() isn't called anywhere even though it might be useful! workarounds! 2015-11-28 12:49:44 -05:00
Nerd Lord
98e3cdeabd Fixes flux and gravitational anomalies sometimes not shocking mobs. 2015-11-28 12:41:28 -05:00
Bjorn Neergaard
959b96b16d Fix up NanoUI states; add snowflake for Drones
Drones are simple_animals?! Why?!

This should let drones use all the things. They have to be nearby,
though.
2015-11-28 12:27:42 -05:00
AnturK
b662b470a9 Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
Nerd Lord
e9bbebfd36 Fixes inflict_handler spells not doing burn damage if brute damage was 0. 2015-11-28 11:42:38 -05:00
Tkdrg
598fea785e Jobban cleanup & performance improvements
Clients now cache their jobbans to save on DB queries.
Legacy jobbans and "new" (savefile) jobbans have been removed.
These are old cruft that has been unused for years, and since we require
a DB for notes anyway we might as well just get rid of the legacy stuff.

I considered removing legacy bans as well, but I was unsure if that
would go way beyond the scope of this PR (my main goal here is making
jobban_isbanned not awful).

Also note that this was basically untested, as I do not have a test
database. Any help testing this would be much appreciated.
2015-11-28 12:35:54 -03:00
AnturK
b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00