Commit Graph

12726 Commits

Author SHA1 Message Date
tkdrg
a3533519ea Merge pull request #13995 from KorPhaeron/tokiwotomare
Timestop fixes
2015-12-28 19:44:08 -03:00
tkdrg
2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework
Simple Vehicle Framework
2015-12-28 19:41:59 -03:00
Remie Richards
db6f01bf5e Formalises Path Compatibility 2015-12-28 22:20:33 +00:00
tkdrg
75df8a35e0 Merge pull request #14102 from KorPhaeron/foam
Unrestricted foam force weapons for admin spawn
2015-12-28 18:47:59 -03:00
tkdrg
7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin
Random ruins for space/lavaland [ready for review]
2015-12-28 18:40:13 -03:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
duncathan salt
0aca78f381 Merge pull request #14100 from Anonus/blobberno
Blobbernauts can no longer smash walls.
2015-12-28 22:04:11 +01:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
KorPhaeron
f312f65aad anti-infinite loop 2015-12-28 09:38:41 -06:00
KorPhaeron
f314b99777 Fixes timestop loops 2015-12-28 05:30:26 -06:00
Bjorn Neergaard
d542163e66 Fix NanoUI and \improper for real 2015-12-28 00:18:43 -06: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
KorPhaeron
ccf44431fa Foam force 2015-12-27 15:41:20 -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
Nerd Lord
87fb506966 Blobbernauts can no longer smash walls.
You know why.
Blobbernauts also get a more accurate description when spawned.
2015-12-27 15:44:18 -05: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
MrStonedOne
5f68bedcd1 Upgrades do_after and progress bars 2015-12-26 21:04:19 -08:00
Remie Richards
3c9c6e5c19 Fixes ATV speed and name, improves janicart cleaning code by using Moved() vs a Move() override. 2015-12-26 23:16:39 +00:00
Remie Richards
bd22fc8c6d Converted janicarts into a simple to use vehicle framework with customisable speed, converted all existing vehicles to the new framework, added a atv type with a turret on it. 2015-12-26 22:54:15 +00: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
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
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
AnturK
72bc9591a2 This is bit better. 2015-12-26 14:10:09 +01:00
KorPhaeron
bcdc028c3b Initial transform 2015-12-26 07:06:57 -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
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
9e7c05e557 Merge pull request #14000 from KorPhaeron/pamphlet
Fixes away mission pamphlet desc
2015-12-25 21:07:21 -03:00
KorPhaeron
fad47ae801 missing space 2015-12-25 17:33:33 -06:00