7bfc5fb4e5
disables Debrain from random objective generation
2015-12-28 19:22:20 -08:00
081aa7099e
Removes Frame, fixes
2015-12-28 16:31:30 -08:00
799a406af4
New Frame Objective, compile fixes
2015-12-28 15:23:42 -08:00
dca91323a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/antag_spawner.dm
code/game/gamemodes/objective.dm
data/mode.txt
2015-12-28 12:40:51 -08:00
34daa84e79
FIXES DO_MOB FUCKING UP THE SERVER
2015-12-28 10:44:31 -08:00
c3d1c92d64
Fix certain progress bars counting down vs counting up.
...
I never hit save when i did this fix before pr-ing this. =\
2015-12-28 10:39:44 -08:00
eed4e4e5fe
Merge pull request #13860 from LanCartwright/plasmaknucklesandwich
...
Fixes Plasma Fist fighting style
2015-12-28 14:37:46 -03:00
e88bf4e2b5
Merge pull request #14084 from MrStonedOne/GOOOOOF
...
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
695afcc94e
removes last_move checks from do_after/do_mob
...
it ticks at 1ds now, the cases where you could move and come back are rare, and require the server to be running at 21fps or higher and you have perfect lag and timing.
2015-12-28 09:21:45 -08:00
a4977e3e2d
fixes drunk typo
2015-12-28 17:06:27 +00:00
555fc6671a
Merge pull request #14093 from KorPhaeron/TK
...
Fixes throwing anchored objects with TK
2015-12-28 13:37:44 -03:00
b4c9dc60eb
Update martial.dm
2015-12-28 13:59:07 +00:00
50a92d5152
Merge pull request #14115 from neersighted/hotfix
...
Fix NanoUI and \improper for real
2015-12-28 03:43:11 -03:00
d542163e66
Fix NanoUI and \improper for real
2015-12-28 00:18:43 -06:00
10867c4aa2
Merge pull request #14069 from Bawhoppen/czechgnades
...
Makes concussion grenade explosion smaller
2015-12-28 01:49:43 -03:00
32ca87bc9c
lets hope
2015-12-27 22:01:22 -06:00
8e53597bea
Merge pull request #14081 from tgstation/RemieRichards-FREE_PERFORMANCE
...
ATMOS SPEED ZOOM ZOOM WEEE Optimises two loops that Dunc missed.
2015-12-28 00:58:29 -03:00
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
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
54e801776d
Revert "Make JSON.stringify encode numbers properly"
...
This reverts commit f4600644ec
2015-12-27 15:45:48 -06:00
f4600644ec
Make JSON.stringify encode numbers properly
...
JSON doesn't allow scientific/exponential notation...
Fixes #14098
2015-12-27 15:19:24 -06:00
dd10637e08
Merge pull request #14065 from AnturK/humanimals
...
Adds helper for creating human looking simple animals
2015-12-27 14:34:31 -03:00
0c4a26df4e
Update mobs.dm
2015-12-27 09:23:05 -08:00
f6db2f4ac9
Merge pull request #14067 from AnturK/mulecratefix
...
Fixes mulebot crates
2015-12-27 14:21:47 -03:00
50bcb521f5
Merge pull request #14056 from neersighted/nano_tweaks
...
Nano Tweaks
2015-12-27 14:20:52 -03:00
32c7cbc78a
topic_state -> nano_state
2015-12-27 11:04:25 -06:00
a173cc01f6
Fix NanoUIs not transfering when the owner ghosts (or reenters)
2015-12-27 10:56:48 -06:00
421a19d576
Merge pull request #13963 from KorPhaeron/lava_land_turfs
...
Lavaland Turfs
2015-12-27 17:38:09 +01:00
f1c6ba90a0
TK
2015-12-27 10:02:30 -06:00
75f26e18ac
Shrink NanoUI by removing library; tidy up code
2015-12-27 09:25:39 -06:00
b11c942842
Merge pull request #14057 from markressler/test
...
added new medicine reagent, haloperidol.
2015-12-27 05:05:43 -03:00
5f68bedcd1
Upgrades do_after and progress bars
2015-12-26 21:04:19 -08:00
250a8cf388
Merge pull request #14030 from Incoming5643/#verifyvenuz
...
Adds the golden revolver
2015-12-27 01:23:33 -03:00
ca272c4980
tweaks size
2015-12-26 21:54:03 -06:00
ac85b68ea9
Optimises a loop in hotspot perform_exposure()
2015-12-27 03:46:25 +00:00
0bffdb4c08
Optimises two loops that Dunc missed.
2015-12-27 03:39:43 +00:00
1d80a58d6b
Merge pull request #14050 from AssassinT90/master
...
Fixes Issue #14047
2015-12-26 21:38:00 -03:00
53920e3071
Merge pull request #14051 from AnturK/teleporterfix
...
Fixes teleporter hub working without power
2015-12-26 21:36:46 -03:00
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
f880b3edb5
fire in the hole
2015-12-26 13:23:59 -06:00
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
0cb8d73e93
Fix NanoUI runtimes when data is null; touch up code
2015-12-26 11:00:50 -06:00
af70509257
Fixes mulebot crates
2015-12-26 17:24:16 +01:00
245b4a6ee9
Subsystem too
2015-12-26 09:59:55 -06:00
ffc6abb223
Clean up NanoUI code style
2015-12-26 09:57:34 -06:00
372e6d2c51
deleted src check
2015-12-26 12:55:31 -03:00
c2c58263ba
fixed description.
2015-12-26 12:51:28 -03:00
6896c63676
updated damage values and description.
2015-12-26 12:47:42 -03:00
979d7851b9
Adds human icon helper
2015-12-26 16:42:41 +01:00
236670dd13
Merge pull request #13941 from Buggy123/master
...
Makes Salicyclic Acid useful
2015-12-26 09:27:12 -06:00
AndrewJacksonThe2nd
Kyle Spier-Swenson
tkdrg
LanCartwright
Bjorn Neergaard
Lularian
duncathan salt
KorPhaeron
bawhoppen
Remie Richards
Incoming
AnturK
markressler
Cheridan