Commit Graph

3912 Commits

Author SHA1 Message Date
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
Razharas
e715e1cc57 Merge pull request #13195 from neersighted/nanoui_update
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03: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
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
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
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
AnturK
caa07f84c4 Adds Send To All to Lawyer/Captain cartridges 2015-11-21 12:24:41 +01:00
octareenroon91
d2fa527045 Add numbers and star graffiti to crayon/spraycan designs. 2015-11-19 17:24:09 -06:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Cheridan
cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
Conflicts:
	code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
kingofkosmos
a121b9308c Removes unneeded restrained-warnings and one canUseTopic-check. 2015-11-18 06:08:31 +02:00
kingofkosmos
38e5420832 Removes can_use -proc from PDA.dm and replaces all instances of it with canUseTopic.
Adds kingofkosmos to admins.txt
2015-11-17 21:26:42 +02:00
Razharas
b3ed636d3c Merge pull request #13034 from kingofkosmos/shardspacenoslip
Stops glass shards from hurting you in space
2015-11-17 05:33:15 +03:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
kingofkosmos
62987c0716 Enables putting an ID into a PDA when the PDA not in your inventory. 2015-11-16 20:41:11 +02:00
MrStonedOne
c784ca902e Ports /vg/'s asset cache system; lowers interface lag when clients connect.
Byond will queue all browse(), browse_rsc(), and winset() calls to the client, to ensure they load in order, and ensure any resources from a browse_rsc call (css/html/js) are already at the client by the time any html windows loads.

How ever, each file is processed separately, and byond will wait for the reply from the client before it will send the next file.

Our current system sends all of these html resource files to the client at once when they connect, this is the sole cause of the lag when a client connects. Byond will not send the client a file it already has, but it has to ask the client first, and it does so one file at a time, waiting for a reply from the client before sending the next one down the pipe.

This system fixes that.

Basically it works like this:
Client connects: nothing happens, no massive queuing of browse_rsc() calls, so no interface delay
Client opens a asset_cache controlled html based interface
Asset cache gets notified by the html based interface what assets the client needs to have.
Asset cache checks to see if it's sent that client those files.
Asset cache sends the missing ones, adding them to the list of assets the client has.

This basically spreads out the delay to when you first open a window that uses resources, where it is much more manageable.

I've kinda done a halfass port without too much thought, I see some room for improvement to better fit /tg/'s coding style and make the system more flexible. I'm PRing this because if I don't, it will never get finished.

PDAs and html_interface has been imported in to the new system lazily to test. at 100ms connection start interface lag went from 35 seconds to 16 seconds. Nanoui hasn't been imported, and once it is, that should drop down to almost nothing.

I'll work on this some more after some sleep.
2015-11-15 23:49:05 -08:00
Razharas
e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
Vincent
faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
kingofkosmos
156d9b558c Crossing a glass shard in space without shoes won't hurt and stun the user anymore. 2015-11-15 17:19:07 +02:00
YotaXP
4ece522dff Removed snowflake. 2015-11-15 02:34:17 -05:00
duncathan salt
31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
Cheridan
9a68f6b69b Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken
The further trials and tribulations of the supermatter sword bugfix
2015-11-14 11:49:55 -06:00
Incoming
bf34b97b1e Gives supermatter swords a better check for adjacency, and moves the parent code below the dust code to be extra sure <b>nothing escapes</b>.
I started up a test server and was smacking people to dust like a pro, armor or not.
2015-11-13 01:13:05 -05:00
YotaXP
47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
YotaXP
e42b1630c5 Allow drones to use and unequip watertanks.
Fixes #6139
2015-11-12 20:29:14 -05:00
duncathan salt
df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
Razharas
3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing"
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
2015-11-12 21:11:50 +03:00
duncathan salt
4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix
Fixes flashbanged mmis in mechs losing access to most mech functions
2015-11-11 16:34:24 -06:00
duncathan salt
b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action
Adds action buttons for slimes
2015-11-11 15:21:05 -06:00
Incoming
d8a0dc6b54 jumps through hoops to save two lines
adds slime growth as a define
2015-11-11 16:00:38 -05:00