Commit Graph

6390 Commits

Author SHA1 Message Date
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 9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Jordie e9ea0d8dc9 Merge pull request #13275 from swankcookie/snowman
Adds Snowman costume
2015-11-29 21:08:11 +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 ee3e5c4d3f Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade
Adds Light Replacer Refilling With Box of Lights
2015-11-29 21:04:43 +11: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
KorPhaeron 4245481019 Lower layer but still higher than it was 2015-11-28 18:48:42 -06: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
AnturK 9a434b669c Academy Fixes 2015-11-28 23:17:57 +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
AnturK b662b470a9 Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
Razharas e715e1cc57 Merge pull request #13195 from neersighted/nanoui_update
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
swankcookie 0b7b49d8c4 fixes issue of missing suit and hat in vendor 2015-11-28 03:11:05 -06:00
Nerd Lord 1414070115 Cult theme update;
Cult stuff uses cult span classes for the most part.
There are beams when using blood drain on a target and when reviving a target with the raise dead rune.
There's a nar-sie maw when you sac something, holy shit.
Sac invocation is now the old invocation, and it worked in testing I promise.
Updates construct descriptions to match what they tend to do.
There's like one or two bugfixes, you can examine talismans as a cultist without the paper menu popping up.
The supply talisman popup is like 50% smaller.
2015-11-27 21:53:56 -05:00
PKPenguin321 5382db940d adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces 2015-11-27 14:56:23 -08:00
Dorsisdwarf 592553354f Merge pull request #12899 from TechnoAlchemisto/master
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
Remie Richards b6209e4508 Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
Remie Richards f55246e5c0 Merge pull request #12987 from AnturK/turrets
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
Remie Richards 62d301bfe5 Merge pull request #12998 from YotaXP/drone-fixes
Allows drones to use 'pick up' and watertanks
2015-11-27 20:38:23 +00:00
Bjorn Neergaard 5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
Bjorn Neergaard b897fb6d72 Fix NanoUIs flashing, update Tanks, Solars, and Canisters 2015-11-27 15:30:18 -05:00
YotaXP 68dbc7cf27 Code formatting!
Dat online PR editor.
2015-11-27 15:18:16 -05:00
Remie Richards fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
duncathan salt 383e77db8a Merge pull request #13220 from KorPhaeron/godwillsit
Adds knight armour
2015-11-27 13:58:08 -06:00
PKPenguin321 cf29721672 fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached 2015-11-26 18:28:12 -08:00
PKPenguin321 7e640d3463 Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods 2015-11-26 17:42:59 -08:00
AnturK e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Bjorn Neergaard 1a44e3d851 Refactor NanoUI API
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Aranclanos e68a5b773a Merge pull request #13173 from swankcookie/SuperMatter_Sword_fix
Supermatter Sword no longer gets bloody
2015-11-26 08:33:56 -03:00
MMMiracles 2d94b0ff9b feedback changes:
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
PKPenguin321 67153e54d3 fixes tgstation.dme since i cucked it by unticking a file accidentally, also makes the teleprods use the correct inhands 2015-11-25 19:03:28 -08:00
PKPenguin321 10f9e4af4f adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe 2015-11-25 18:36:09 -08:00
KorPhaeron c8f3ca728f Adds Knight Armour 2015-11-25 15:46:54 -06:00
Razharas e0508ad572 Merge pull request #13050 from MrStonedOne/connectlagfixthankspjb
[Ready] Fixes the 2 minutes of interface lag (such as ready button not working) when a client connects.
2015-11-25 20:43:45 +03:00
AnturK e93fc3c6d2 Turrets now need to be linked to built turret controls using multiool. Map-placed ones autolink as before
Changes multitool buffer type to better reflect the use
2015-11-25 14:41:20 +01:00
MrStonedOne ca4f4201e7 Asset Cache improvements!
Adds crew monitor to the asset cache system
Adds paper to the asset cache system

Added a way to send files to the client slowly without clogging up the queue. (This isn't technically "safe", but the client would only have issues if they didn't have that file already (rare), and only if they used a window that needed that asset (currently only nanoui windows) within the first 15 to 90 seconds of connecting (depending on ping))

Makes NanoUI use this slow send system to blindly send it's asset files. (Once bay's nanoui is ported, i'll improve this so that nanoui fully implements asset cache checking)

Makes asset cache use this system to send all registered asset files, so that ui windows don't have to wait for them if the client's been connected a while.
2015-11-25 02:11:04 -08:00
Aranclanos 0f1945bef6 Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor
ID into PDA without PDA in your inventory and a few other similar things
2015-11-23 20:27:07 -03:00
AnturK 05cb510dc7 Neater 2015-11-23 19:31:28 +01:00
swankcookie d56c24f841 SM Sword 2015-11-22 23:44:23 -06:00
phil235 77de108fe7 Merge pull request #13143 from Anonus/blobactors
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
phil235 ab1e9f2d15 Merge pull request #13160 from Firecage/optablefix
Fixes op table buckling Take #2
2015-11-22 18:38:19 +01:00
Firecage e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02:00
Firecage 9fe09959a4 Changes the base toolspeed var to 1 2015-11-21 19:40:20 +02:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
AnturK caa07f84c4 Adds Send To All to Lawyer/Captain cartridges 2015-11-21 12:24:41 +01:00