Incoming
|
6296043d85
|
Fixes High Volume Mode not toggling properly
|
2015-12-28 19:00:22 -05:00 |
|
tkdrg
|
1dec16cbb9
|
Merge pull request #13936 from Shadowlight213/AdminAIToggle2
Makes Admin AI interaction a logged toggle. Take 2
|
2015-12-27 22:01:01 -03:00 |
|
Bjorn Neergaard
|
65a2c50908
|
Properly encode NanoUI JSON...
This is right, not the last fix. The '+' in BYOND scientific notation was becoming a space.
|
2015-12-27 15:49:38 -06:00 |
|
Bjorn Neergaard
|
54e801776d
|
Revert "Make JSON.stringify encode numbers properly"
This reverts commit f4600644ec.
|
2015-12-27 15:45:48 -06:00 |
|
Bjorn Neergaard
|
f4600644ec
|
Make JSON.stringify encode numbers properly
JSON doesn't allow scientific/exponential notation...
Fixes #14098
|
2015-12-27 15:19:24 -06:00 |
|
tkdrg
|
dd10637e08
|
Merge pull request #14065 from AnturK/humanimals
Adds helper for creating human looking simple animals
|
2015-12-27 14:34:31 -03:00 |
|
tkdrg
|
f6db2f4ac9
|
Merge pull request #14067 from AnturK/mulecratefix
Fixes mulebot crates
|
2015-12-27 14:21:47 -03:00 |
|
tkdrg
|
50bcb521f5
|
Merge pull request #14056 from neersighted/nano_tweaks
Nano Tweaks
|
2015-12-27 14:20:52 -03:00 |
|
Bjorn Neergaard
|
32c7cbc78a
|
topic_state -> nano_state
|
2015-12-27 11:04:25 -06:00 |
|
Bjorn Neergaard
|
a173cc01f6
|
Fix NanoUIs not transfering when the owner ghosts (or reenters)
|
2015-12-27 10:56:48 -06:00 |
|
duncathan salt
|
421a19d576
|
Merge pull request #13963 from KorPhaeron/lava_land_turfs
Lavaland Turfs
|
2015-12-27 17:38:09 +01:00 |
|
Bjorn Neergaard
|
75f26e18ac
|
Shrink NanoUI by removing library; tidy up code
|
2015-12-27 09:25:39 -06:00 |
|
tkdrg
|
b11c942842
|
Merge pull request #14057 from markressler/test
added new medicine reagent, haloperidol.
|
2015-12-27 05:05:43 -03:00 |
|
tkdrg
|
250a8cf388
|
Merge pull request #14030 from Incoming5643/#verifyvenuz
Adds the golden revolver
|
2015-12-27 01:23:33 -03:00 |
|
tkdrg
|
1d80a58d6b
|
Merge pull request #14050 from AssassinT90/master
Fixes Issue #14047
|
2015-12-26 21:38:00 -03:00 |
|
tkdrg
|
53920e3071
|
Merge pull request #14051 from AnturK/teleporterfix
Fixes teleporter hub working without power
|
2015-12-26 21:36:46 -03:00 |
|
tkdrg
|
7ab1cc2968
|
Merge pull request #14046 from Anonus/whytalyn
Fixes retrovirus referring to ryetalyn as a possible cure
|
2015-12-26 17:06:28 -03:00 |
|
Incoming
|
649fa1cdeb
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into #verifyvenuz
# Conflicts:
# icons/obj/guns/projectile.dmi
|
2015-12-26 14:19:58 -05:00 |
|
Bjorn Neergaard
|
0cb8d73e93
|
Fix NanoUI runtimes when data is null; touch up code
|
2015-12-26 11:00:50 -06:00 |
|
AnturK
|
af70509257
|
Fixes mulebot crates
|
2015-12-26 17:24:16 +01:00 |
|
Bjorn Neergaard
|
245b4a6ee9
|
Subsystem too
|
2015-12-26 09:59:55 -06:00 |
|
Bjorn Neergaard
|
ffc6abb223
|
Clean up NanoUI code style
|
2015-12-26 09:57:34 -06:00 |
|
markressler
|
372e6d2c51
|
deleted src check
|
2015-12-26 12:55:31 -03:00 |
|
markressler
|
c2c58263ba
|
fixed description.
|
2015-12-26 12:51:28 -03:00 |
|
markressler
|
6896c63676
|
updated damage values and description.
|
2015-12-26 12:47:42 -03:00 |
|
AnturK
|
979d7851b9
|
Adds human icon helper
|
2015-12-26 16:42:41 +01:00 |
|
Cheridan
|
236670dd13
|
Merge pull request #13941 from Buggy123/master
Makes Salicyclic Acid useful
|
2015-12-26 09:27:12 -06:00 |
|
phil235
|
68ab5f72ee
|
Merge pull request #14061 from tkdrg/fuckme
Fixes indentation in cockroach death()
|
2015-12-26 14:54:30 +01:00 |
|
tkdrg
|
c64430a0fd
|
Merge pull request #13996 from AnturK/fixfixfix
Minor fixes
|
2015-12-26 10:23:21 -03:00 |
|
tkdrg
|
b689055016
|
Merge pull request #13986 from KorPhaeron/illusion
Fixes illusions running about on their face
|
2015-12-26 10:16:45 -03:00 |
|
tkdrg
|
d32c045068
|
Merge pull request #13999 from KorPhaeron/morph
Morph uses appearance
|
2015-12-26 10:12:16 -03:00 |
|
AnturK
|
72bc9591a2
|
This is bit better.
|
2015-12-26 14:10:09 +01:00 |
|
tkdrg
|
ac7e0cc036
|
Merge pull request #13805 from KorPhaeron/stacking_decals
Fixes decal stacking
|
2015-12-26 10:07:18 -03:00 |
|
KorPhaeron
|
bcdc028c3b
|
Initial transform
|
2015-12-26 07:06:57 -06:00 |
|
KorPhaeron
|
c4735d2bc5
|
Initial
|
2015-12-26 07:06:07 -06:00 |
|
KorPhaeron
|
a47b490d2b
|
That was dumb
|
2015-12-26 07:00:20 -06:00 |
|
KorPhaeron
|
1a958e83b6
|
Stacking decals
|
2015-12-26 06:47:07 -06:00 |
|
Tkdrg
|
42cd502626
|
Fixes indentation in cockroach death()
Thanks @phil235 !
|
2015-12-26 09:33:56 -03:00 |
|
markressler
|
1534406d92
|
added new medicine reagent, haloperidol.
|
2015-12-26 05:31:46 -03:00 |
|
tkdrg
|
f83b1ccb24
|
Merge pull request #14039 from KorPhaeron/detective_buff
Detective starts with his bowman on
|
2015-12-26 04:44:52 -03:00 |
|
tkdrg
|
c4e7e31c92
|
Merge pull request #14032 from KorPhaeron/chainsaw
Fixes chainsaw surgery
|
2015-12-26 04:43:09 -03:00 |
|
tkdrg
|
d4cc57041b
|
Merge pull request #14029 from PKPenguin321/patch-6
Fixes some EZ issues
|
2015-12-26 04:42:51 -03:00 |
|
tkdrg
|
6314572c46
|
Merge pull request #13991 from Jordie0608/thepinatateacheskidsvitalessonsabouthowviolenceisrewarding
Generalises simple animal loot drops and removes copypasta
|
2015-12-26 04:34:27 -03:00 |
|
Bjorn Neergaard
|
7d5487c169
|
Tweak ghost NanoUI interaction code; touchup frontend
Resolves #14044
|
2015-12-26 01:21:58 -06:00 |
|
Bjorn Neergaard
|
1e951d9fcf
|
Rework NanoUI frontend to be lighter; fix drag/resize jitter
|
2015-12-26 01:21:57 -06:00 |
|
Bjorn Neergaard
|
7132c5bd8d
|
Cache NanoUI HTML
|
2015-12-26 01:21:57 -06:00 |
|
Bjorn Neergaard
|
2b5ea04485
|
Compile HTML as another asset; improve loading spinner
|
2015-12-26 01:21:56 -06:00 |
|
Bjorn Neergaard
|
d42a111d93
|
Drop Javascript library to get even smaller
|
2015-12-26 01:21:56 -06:00 |
|
Jordie
|
0ee6c6acd0
|
readds layer hack for mining mob loot
|
2015-12-26 15:50:54 +11:00 |
|
tkdrg
|
199b0e4776
|
Merge pull request #14011 from Anonus/moreblobscaling
Tweaks blob burst times upwards, adds LORE
|
2015-12-26 00:40:17 -03:00 |
|