duncathan salt
19fc2d952a
Merge pull request #13392 from Razharas/GrabLogs
...
Added logs to when someone tries to click something with a grab
2015-12-03 10:04:42 -06:00
Aranclanos
d1071aa5b7
Merge pull request #13365 from tkdrg/badminthings
...
Admin HUD improvements
2015-12-03 01:39:51 -03:00
Cheridan
96d9609b14
Merge pull request #13380 from Incoming5643/I_changed_my_mind
...
Spares those in critical from the mass mindshuffle event
2015-12-02 21:59:36 -06:00
Jordie
bfe4d41554
Merge pull request #13408 from neersighted/hotfix
...
Hotfix for SStimer lag
2015-12-03 14:34:45 +11:00
Jordie
428ad00bb4
Merge pull request #13395 from neersighted/nano_touchup
...
Fix NanoUI for admin ghosts.
2015-12-03 14:24:43 +11:00
Jordie
075e9e0fcb
Merge pull request #13381 from Anonus/spritefix
...
Gives artificers feedback when healing other constructs plus a few sprite fixes
2015-12-03 14:20:58 +11:00
Bjorn Neergaard
6ec257c360
Hotfix for SStimer lag
...
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
2015-12-02 21:23:45 -05:00
Cheridan
726e568c26
Merge pull request #13407 from neersighted/hotfix
...
Hotfix for Cryo and NanoUI
2015-12-02 19:56:35 -06:00
Nerd Lord
6bd6b7ccf5
Conflixed
2015-12-02 20:30:38 -05:00
Bjorn Neergaard
864caa9d62
Hotfix for Cryo (JSON problems) and render issues (Internet Explorer)
...
Blame MSO
2015-12-02 19:48:16 -05:00
Cheridan
08a8115790
Merge pull request #13271 from KorPhaeron/new_mining_turfs
...
New mining turf sprites
2015-12-02 18:11:46 -06:00
Nerd Lord
b16ed6d5b8
oldcode deserves to die
...
juggernaut reflection uses the apply damage proc correctly instead of checking if the damage type is brute or burn
2015-12-02 17:50:21 -05:00
Nerd Lord
a54356f460
Removes terrible, unnecessary bullet_act() from constructs, replacing it with the proper damage_coeff list.
...
I'd bet money it was there just so ebows couldn't damage constructs.
2015-12-02 17:43:59 -05:00
Cheridan
f634890457
Merge pull request #13335 from Incoming5643/fudge_dice
...
Fudge dice
2015-12-02 16:40:25 -06:00
Bjorn Neergaard
1d60873949
Fix NanoUI for admin ghosts.
...
Also, rename the base state file.
2015-12-02 12:53:36 -06:00
Razharas
52fd90b9e4
Added logs to when someone tries to click something with a grab, like table/cryo
2015-12-02 19:04:44 +03:00
duncathan salt
38c2d8087e
Merge pull request #13378 from swankcookie/cakehat_fix
...
Redo of #13304 (Cakehat fix)
2015-12-02 09:37:27 -06:00
Remie Richards
d909c1e82d
Merge pull request #13348 from neersighted/spooky_nanoui
...
Allow ghosts to use any NanoUI interface.
2015-12-02 14:15:33 +00:00
Remie Richards
16e414d86c
Merge pull request #13344 from MrStonedOne/patch-77
...
Fixes library computer's next page not working.
2015-12-02 14:10:22 +00:00
Remie Richards
70b01dd7a0
Merge pull request #13352 from MrStonedOne/patch-78
...
Optimizes JSON writer
2015-12-02 14:09:56 +00:00
Kyle Spier-Swenson
8427287541
Optimizes json writer, attempt 2
...
I couldn't make this just use list2text on lists because nested lists are a thing.
This is almost as good, as saves a few more string free writes.
2015-12-02 03:50:04 -08:00
Jordie
8425b5c4cf
Merge pull request #13346 from neersighted/nano_tweaks
...
Tweak some NanoUI stuff
2015-12-02 15:54:02 +11:00
Jordie
399accf949
Merge pull request #13347 from neersighted/pull_release
...
Allow you to stop pulling by pulling the same object again.
2015-12-02 15:53:18 +11:00
Nerd Lord
0174352a05
YOU CAN'T REPAIR DENTS THAT DON'T EXIST
2015-12-01 23:16:21 -05:00
Nerd Lord
9f35e17513
Gives artificers feedback when healing another construct, showing how much health it has.
...
Constructs can into space.
Fixes cult flooring not lining up with normal floors, I don't care if you're evil, this is just wrong.
Fixes a juggernaut back spine being not glowy enough.
2015-12-01 23:05:41 -05:00
Incoming
3a85a3777f
Spares those in critical from the mass mindshuffle event.
...
This was always the intention, but past me made a mistake I know I've made and fixed sense: He assumed that living_mob_list was a list of !stat mobs, when really it was a list of stat != 2 mobs
2015-12-01 23:05:35 -05:00
swankcookie
3e5e9086c0
fix
2015-12-01 21:52:35 -06:00
Bjorn Neergaard
6aa3ed1f9c
Remove an unused var from Chemistry-Machinery
2015-12-01 17:09:03 -06:00
Tkdrg
2b0ee4f591
Admin HUD improvements
...
Adds the sec hud for implants and stuff.
2015-12-01 19:15:06 -03:00
Razharas
b864503724
Merge pull request #13336 from neersighted/chem_nanoui_fixes
...
Remove calls to a private NanoUI proc from Chemistry-Machinery
2015-12-02 00:40:52 +03:00
Razharas
e091d35439
Merge pull request #13334 from AnturK/botfix
...
Bot fixes
2015-12-01 21:00:23 +03:00
Bjorn Neergaard
8b77dd0de1
Finally get this pulling check right
2015-12-01 08:37:38 -06:00
Bjorn Neergaard
2a7be3c878
Fix swapped check
2015-12-01 07:30:20 -05:00
Kyle Spier-Swenson
9335734e3f
forgot a quote
2015-11-30 23:22:22 -08:00
Kyle Spier-Swenson
6b8436558e
Deleted 1 too many lines
2015-11-30 22:47:15 -08:00
Kyle Spier-Swenson
03f29f3b99
Makes json writer use 90% less string tree operations
...
"[thing1][thing2][thing3]" and text() both compile to use only 1 string tree operation regardless of the number of args.
list2text abuses this to write 128 items of the list in 1 go, and it also handles the separator in the proper way, so no reason to not use it.
this also cuts 1 string tree operation out of every associative list write as well as 1 out of the writing of every item in that list.
So now the string tree O notation should be O(n log2(M)) rather then O(N^M) (ish)
2015-11-30 22:45:31 -08:00
Bjorn Neergaard
3428e0e734
Fix NanoUI display issues
...
Apparently newer version of IE choke on this, and we target newer
versions anyway...
2015-12-01 00:22:50 -05:00
Bjorn Neergaard
6f098e8298
Allow ghosts to use any NanoUI interface.
2015-11-30 23:34:59 -05:00
duncathan salt
37d1111685
Merge pull request #13310 from swankcookie/Cloak_fix
...
puts cloak in suit slot
2015-11-30 21:34:52 -06:00
Bjorn Neergaard
c523dfcb85
Allow you to stop pulling by pulling the same object again.
2015-11-30 22:27:41 -05:00
duncathan salt
c9ee58c120
Merge pull request #13253 from SuperSayu/abstract_holodeck
...
Holodeck Fixes
2015-11-30 21:26:52 -06:00
Bjorn Neergaard
b4bcaa3930
Tweak some NanoUI stuff
...
Sanitize config_data
Log open UIs
2015-11-30 22:21:26 -05:00
Kyle Spier-Swenson
02b4ce079a
Fixes library computer's next page not working.
2015-11-30 18:40:42 -08:00
Kyle Spier-Swenson
2d9ecd54a9
FIXES DEAD CHAT QUICK MERGE PLS
2015-11-30 17:26:58 -08:00
Vincent
16303c1c1f
Changes flag name from ABSTRACT to NODECONSTRUCT
...
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
Vincent
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
Cheridan
f7c88bb42c
Merge pull request #13319 from tkdrg/jobbanfix
...
Fixes jobban_isbanned() runtime
2015-11-30 15:04:58 -06:00
Bjorn Neergaard
339369bc63
Remove calls to a private NanoUI proc from Chemistry-Machinery
...
Also mark procs as private (because they should have been private the whole time).
Get off my lawn!
2015-11-30 14:40:10 -06:00
Incoming
0c1d7272d5
Adds fudge dice
...
They're six sided dice with two pluses, two minusii, and two blank sides.
They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.
Adds them to the "rare dice" spawn in dice bags.
Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.
Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
Cheridan
0a62f392e5
Merge pull request #13299 from MrStonedOne/patch-75
...
Gives deadchat the (f) follow link.
2015-11-30 13:23:40 -06:00
