Commit Graph

14295 Commits

Author SHA1 Message Date
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
GunHog 4b7b8a0e94 Adds Bots to Diagnostic HUDs
- Adds bots to the Diagnostic HUD.
- Fixes mode tracking issues with AI's botcall interface
- Added Sentience tracking to bots in PDA and AI displays
- New HUD sprites by WJohnston
- Moved bot defines to its own file so it can be used properly.
2015-12-02 16:16:33 -06:00
AnturK a9caf9b140 More Bot Fixes 2015-12-02 20:53:56 +01:00
Bjorn Neergaard 1d60873949 Fix NanoUI for admin ghosts.
Also, rename the base state file.
2015-12-02 12:53:36 -06:00
kingofkosmos 03b751aafa Makes the bluescape rapid part exchange device share the same in-hand sprite with the normal RPED. 2015-12-02 18:19:10 +02: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
Razharas c9069cc358 Added logging to slips 2015-12-02 18:27:11 +03:00
Bjorn Neergaard 5a4089432c Tweak NanoUI Subsystem code 2015-12-02 09:15:21 -06:00
MrStonedOne a1bfb37f0c Tweaks lighting some more.
This should be ready to go.
2015-12-02 07:12:37 -08: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
Bjorn Neergaard e47c59c98b Add remove buttons directly to Chem Dispenser 2015-12-02 00:09:51 -05: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
Bjorn Neergaard e96590ff59 Make Ctrl-Click unpull work by using the verb
Did not realize this didn't use the verb.
2015-12-01 23:08:07 -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
kingofkosmos ee522d61d7 Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites 2015-12-02 06:05:40 +02: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
MMMiracles 77b36e2415 iced windows, more ice variants of shit in general.
more stuff, ice everything.

wew

conflict fix
2015-12-01 16:45:09 -05: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
Thunder12345 07a9aa65b8 More efficiency things 2015-12-01 17:32:33 +00:00
Thunder12345 e628f4869b Makes faction checking more efficient. Adds a chime to go with the exclamation mark. 2015-12-01 17:15:46 +00:00
Bjorn Neergaard 8b77dd0de1 Finally get this pulling check right 2015-12-01 08:37:38 -06:00
Thunder12345 f3b0847042 ! 2015-12-01 14:32:10 +00:00
Bjorn Neergaard 2a7be3c878 Fix swapped check 2015-12-01 07:30:20 -05:00
Thunder12345 a0394c94ed Adds summon_backup() to hostile animals 2015-12-01 11:00:02 +00:00
KorPhaeron e29b224ef2 Fixes flame armour 2015-12-01 02:00:35 -06: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