Commit Graph

11903 Commits

Author SHA1 Message Date
Bjorn Neergaard
588a170c8d Fix NanoUI debug verb 2015-11-26 07:11:32 -05:00
Bjorn Neergaard
1a44e3d851 Refactor NanoUI API
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Bjorn Neergaard
5e9c0adc3b Add NanoUI debug verb
A quick tool that helps me reload templates.
Also refactor NanoUI resource code a bit.
2015-11-26 07:11:29 -05:00
Bjorn Neergaard
a1bae60b25 Remove Bay's minimap-generating code.
We have our own in the crew computer we will use.
2015-11-26 07:11:28 -05:00
Bjorn Neergaard
56e359efb8 Refactor JSON
* Move into seperate module
* Use aboslute pathing
2015-11-26 07:11:28 -05:00
Bjorn Neergaard
4e5edf396a Update NanoUI
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -05:00
Aranclanos
be5d864640 Merge pull request #13176 from neersighted/borg_toner
Make Cyborg Toner refillable by Rechargers.
2015-11-26 08:32:39 -03:00
Aranclanos
64b7ec13da Merge pull request #13206 from JJRcop/i12121
Fixes camera taking pictures when you try to put them on a table
2015-11-26 07:09:58 -03:00
YotaXP
9fe9c2faa4 Remove side effects from Character Setup 2015-11-25 18:06:05 -05:00
Kyle Spier-Swenson
17d67bbf67 Fixes clients sometimes not getting verbs for a while 2015-11-25 10:28:30 -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
Cheridan
9bc2b0a8cc Merge pull request #13191 from Anonus/logmymemes
Revenant say and transmit now log
2015-11-25 11:18:49 -06:00
Cheridan
67da7b7117 Merge pull request #13085 from Incoming5643/I_only_get_like_one_controversal_pull_a_year_I_better_make_this_count
A number of nerfs and buffs to stunning spells
2015-11-25 11:13:09 -06:00
Cheridan
d876249b62 Merge pull request #13192 from PKPenguin321/patch-5
Allows chainsaws to be used as a ghetto version of the generic sawing step
2015-11-25 11:10:23 -06:00
JJRcop
e0446d5187 Formatting fixes for camera's afterattack 2015-11-25 11:27:53 -05: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
MrStonedOne
f5deff001b Removes debugging asset cache line
Keeping it in because i'm going to need it when I bring nanoui in to this system.
2015-11-24 23:41:25 -08:00
MrStonedOne
4ffb421bb7 Adds client skin and topic for asset cache. 2015-11-24 23:31:44 -08:00
JJRcop
c30b70e785 Fixes bug with cameras and containers/structures 2015-11-25 00:44:52 -05:00
Cheridan
e526a4fa40 Merge pull request #13164 from MrStonedOne/patch-65
Fixes library computers thinking they already built their menu
2015-11-24 23:42:41 -06:00
Cheridan
8a595c4cb5 Merge pull request #13184 from YotaXP/char-preview
Accurate Character Setup Preview
2015-11-24 18:48:30 -06:00
Razharas
1ed275b096 Merge pull request #12719 from KorPhaeron/zombiefix
Fixes zombie infection holders
2015-11-25 02:29:47 +03:00
Razharas
41b5776893 Merge pull request #13174 from optimumtact/if_cat_parts_are_fine_then_this_is_too
Adds tarajan race to the game
2015-11-24 18:02:27 +03:00
PKPenguin321
d03a1b5083 adds chainsaws to ghetto sawing tools
adds chainsaws and mounted chainsaws as ghetto analogues for generic sawing steps
2015-11-23 22:33:13 -08:00
Nerd Lord
e9e5f28ca7 Revenant say and transmit now log(thanks xhuis, copying alien whisper but without the logging)
This means you can goad someone into doing stuff and they won't get bant for it because they can say the revenant did it and have the logs to prove it(and in turn, you can't use the excuse "the revenant said to do it" when it totally didn't you liar)
2015-11-23 23:49:37 -05:00
duncathan salt
4a363b4363 Merge pull request #12910 from KorPhaeron/ghost_spawner
Ghost spawner naming fix
2015-11-23 20:02:53 -06: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
Aranclanos
705ddc79d2 Merge pull request #13057 from tkdrg/fiah
Fixes the maxbodytemp of some simple_animals
2015-11-23 20:22:44 -03:00
YotaXP
76acfe4349 Rewrote the character setup preview icon code 2015-11-23 17:34:31 -05:00
Bjorn Neergaard
b5113aa5f8 Make Cyborg Toner refillable by Recharging Stations.
Closes #13073
2015-11-23 09:55:06 -05:00
oranges
268d2f0522 Adds tarajan race to the game
as a retardation meme reference
2015-11-23 18:48:02 +13:00
Razharas
9fcbb8f151 Merge pull request #13145 from MrStonedOne/patch-64
Fixes readmin not working with keys
2015-11-23 08:19:42 +03:00
Kyle Spier-Swenson
184b7ea5ce Fixes library computers thinking they already built their menu 2015-11-22 14:49:29 -08:00
phil235
77de108fe7 Merge pull request #13143 from Anonus/blobactors
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
phil235
1fbd41fd91 Merge pull request #13140 from Anonus/revenfixes
Revenant Bugfixes
2015-11-22 18:28:05 +01:00
Nerd Lord
1c2c00759d oh wait I shouldn't have done that anyway
revenants don't get nar-sied sorry lady you'll have to eat something else
2015-11-22 12:13:34 -05:00
Cheridan
ee75d5a24e Merge pull request #13131 from octareenroon91/patch-30
Spill Oxygen / Obtain Atmosphere
2015-11-21 23:52:34 -06:00
Remie Richards
af1922ac57 Merge pull request #13128 from Anonus/jauntblob
Adjusts blob ability costs down slightly, gives blobs a hud
2015-11-21 22:38:03 +00:00
KorPhaeron
888fe9fb30 Default 2015-11-21 06:43:01 -06:00
octareenroon91
e2a27fb018 Add Carbon Dioxide. 2015-11-21 06:20:16 -06:00
Kyle Spier-Swenson
226c92bbca Fixes readmin not working with keys 2015-11-20 21:11:26 -08:00
Nerd Lord
f458c2cead The blob eats nondense things in all cases.
Probably fixes one or two bugs in the process.
2015-11-20 21:03:43 -05:00
Nerd Lord
4ed2730155 TODO: rewrite all of event code so you can check if the event can run in the first place. 2015-11-20 20:02:08 -05:00
Nerd Lord
00e7cf9836 Fixes #11442 and tweaks the icon update to use WIZARDRY
Also fixes the event possibly using up all chances to occur if there are too few dead mobs.
2015-11-20 19:51:34 -05:00
Cheridan
7595a4b728 Merge pull request #13125 from phil235/NoDoubleChemHandling
Fixes human having two handle_chemicals_in_body() procs.
2015-11-20 17:29:12 -06:00
Cheridan
a88503cfca Merge pull request #13115 from bgobandit/dronedetox
Drones no longer receive toxin damage.
2015-11-20 17:06:03 -06:00
Cheridan
f2988045da Merge pull request #13036 from AnturK/fixx
Some visibility fixes
2015-11-20 17:04:05 -06:00
Nerd Lord
b163bce082 Adds blob help! Blobs can now check what stuff does with a help verb! Help, it's eating me!
Blobs now get to know what their chemical does.
Added two more buttons, for readapt chemical and storage blob.
Added hotkey for removing blobs, alt-click.
Removing a blob gives you some points back.
2015-11-20 17:00:43 -05:00
Cheridan
3aa76f80e9 Merge pull request #13080 from PKPenguin321/patch-4
HoG fountains now give an omnizine-like reagent instead of Doctor's Delight + Typo Fix
2015-11-19 22:43:12 -06:00
octareenroon91
1d8dd9a3e0 Spill Oxygen / Obtain Atmosphere
Give oxygen and nitrogen reaction_obj and reaction_turf functions, which produce their respective gases.
2015-11-19 22:22:47 -06:00