Bjorn Neergaard
1d60873949
Fix NanoUI for admin ghosts.
...
Also, rename the base state file.
2015-12-02 12:53:36 -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
Bjorn Neergaard
6aa3ed1f9c
Remove an unused var from Chemistry-Machinery
2015-12-01 17:09:03 -06: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
Cheridan
0a62f392e5
Merge pull request #13299 from MrStonedOne/patch-75
...
Gives deadchat the (f) follow link.
2015-11-30 13:23:40 -06:00
Razharas
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
AnturK
a8ea3e25c1
Fixes player medbot overdoses
...
Makes braindead bots get back to work.
2015-11-30 16:52:25 +01:00
Razharas
3c0100cbf1
Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device
...
The Bluespace Wormhole Projector now teleports mobs!
2015-11-30 18:18:22 +03:00
Cheridan
4f38906dd5
Merge pull request #13311 from KorPhaeron/wild_west
...
Fixes wild west windows
2015-11-30 07:12:05 -06:00
AnturK
b216ffe457
Fixes Player bots moving while deactivated
...
Fixes Player bot radios
Removes unused HEADSET_SECURE radio mode
Adds secbot/ed209 stuns to attack log
Allows player mulebots to drop the cargo by resisting
2015-11-30 14:07:38 +01:00
Cheridan
c2d4f17fb7
Merge pull request #13297 from YotaXP/swarmer-crystal
...
Make swarmers drop a bluespace crystal
2015-11-30 01:44:57 -06:00
Cheridan
76b71469ea
Merge pull request #13308 from swankcookie/autorifle_fix
...
Changes ammo type in autorifle desc
2015-11-29 23:30:14 -06:00
Cheridan
5e9017977d
Merge pull request #13298 from neersighted/attack_anim
...
Improve Attack animations
2015-11-29 23:17:02 -06:00
duncathan salt
ad410e39d8
Merge pull request #13296 from neersighted/nanoui_checks
...
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
KorPhaeron
0f2eee4e17
Cleans up meatgrinder code
2015-11-29 18:30:34 -06:00
Cheridan
3f231755cf
Merge pull request #13295 from KorPhaeron/wj_hates_fun
...
Removes simple xenomorphs from gold slime cores
2015-11-29 18:07:09 -06:00
Vincent
05ae680b06
Fixing conflicts:
...
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
duncathan salt
77b841fe9b
Merge pull request #13305 from KorPhaeron/hardhat
...
Removes relative pathing in hardhat.dm
2015-11-29 17:30:27 -06:00
Cheridan
126e2ce5e3
Merge pull request #13289 from phil235/HostileAnimalProjectileFix
...
Hostile Animal Projectile Fix
2015-11-29 17:25:24 -06:00
Bjorn Neergaard
06e5df9336
Fix NanoUI missing assignment; use two-line ifs
2015-11-29 18:20:10 -05:00
Bjorn Neergaard
df02a33f3d
Remove redundant NanoUI checks
2015-11-29 17:49:29 -05:00
Bjorn Neergaard
8ba095a931
Fix a typo
2015-11-29 16:56:22 -05:00
duncathan salt
6fca11d85f
Merge pull request #13292 from neersighted/nanoui_update
...
Fix Chemistry NanoUIs
2015-11-29 15:42:28 -06:00
YotaXP
3c005616d5
Make swarmers drop ARTIFICIAL bluespace crystals.
2015-11-29 16:18:42 -05:00
Tkdrg
4da263dead
Fixes jobban_isbanned() runtime
...
Fixes runtime with ckey-less mobs.
2015-11-29 17:31:19 -03:00
swankcookie
808adcfa9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cloak_fix
...
# Conflicts:
# icons/mob/suit.dmi
2015-11-29 13:38:16 -06:00
Remie Richards
edfb957bd2
Merge pull request #13088 from as334/master
...
Plasmamen fixes
2015-11-29 19:17:11 +00:00
