91c4d1bef8
Merge pull request #13440 from octareenroon91/patch-32
...
Give wallets merged access of all IDs inside.
2015-12-07 17:37:44 +00:00
9ec6e187a4
Merge pull request #13464 from Anonus/hostileconstructs
...
Spawnable hostile constructs, for away missions and adminfuckery
2015-12-06 17:25:53 -06:00
01b12caec8
obey the dunc
2015-12-06 17:41:27 -05:00
fcc977fa2f
Merge pull request #13487 from MrStonedOne/patch-84
...
[s]fixes typo in is banned()
2015-12-06 21:03:35 +00:00
88a795a0c6
fixes typo in is banned()
2015-12-06 12:54:36 -08:00
8daec1c8a5
Merge pull request #13485 from MrStonedOne/patch-83
...
Cleans up some unused code
2015-12-06 20:22:05 +00:00
0d55edc2b0
Hot fix for stickybans going hey wire
2015-12-06 12:20:12 -08:00
02fe4ec5a8
Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP
...
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
2015-12-06 19:52:06 +03:00
5ed60c2052
Merge pull request #13452 from KorPhaeron/too_many_ghosts
...
Revenant event can only occur once per round
2015-12-06 17:21:05 +03:00
5a5a48f19a
Automatic changelog compile
2015-12-06 06:24:20 +00:00
a32f9134bb
Automatic changelog generation for PR #13401
2015-12-06 06:19:58 +00:00
c018b514d2
Merge pull request #13401 from GunHog/Of_Bots_And_Diagnostic_HUDs
...
Adds Bots to Diagnostic HUDs
2015-12-06 17:19:56 +11:00
33d749fa62
Merge pull request #13398 from AnturK/morebotfix
...
More Bot Fixes
2015-12-06 17:13:10 +11:00
45771e8a48
Automatic changelog generation for PR #13438
2015-12-06 06:11:21 +00:00
d49bd5b487
Merge pull request #13438 from neersighted/cryo_alarm
...
Fix Cryo checks
2015-12-06 17:11:20 +11:00
43cf0d52a7
Merge pull request #13432 from MMMiracles/SHIFTCLICKNOTMIDDLECLICKYOUFUCK
...
Morphs SHIFT-CLICK not MIDDLE-CLICK
2015-12-06 17:07:39 +11:00
c7dfcddc15
Merge pull request #13422 from tkdrg/a
...
Fixes APC emp_act
2015-12-06 17:06:34 +11:00
45a9e138b2
Merge pull request #13435 from SuperSayu/window_unbreaker
...
Fixes window fixing
2015-12-06 12:06:37 +11:00
b68e4efca5
Merge pull request #13448 from MMMiracles/merge
...
fixes caves.dmm not actually working
2015-12-06 12:06:25 +11:00
5646f0eb5b
syntax error
2015-12-05 18:42:50 -06:00
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
b9bd386a3e
coughing noise, comma comes out
2015-12-05 19:18:58 -05:00
a0b2b0a721
Couple of small fixes.
...
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
3c75d78f84
Use a list instead of net_id
...
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
953f175d2e
Hostile mobs don't get a target if the damage dealt is 0 or less.
2015-12-05 10:58:08 -05:00
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
1af3c19f30
Automatic changelog compile
2015-12-05 07:13:24 +00:00
6f9a6a5901
ok
2015-12-05 00:54:19 -05:00
249a43bb08
Merge pull request #13399 from tgstation/duncathan-patch-1
...
removes unused gas mixture code
2015-12-04 21:05:35 -03:00
3de101ff04
One revenant per round
2015-12-04 16:44:24 -06:00
41341461b0
Merge pull request #13393 from kingofkosmos/fewinhandsprites
...
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
b888cb8333
Merge pull request #13427 from Anonus/vineathon2015
...
Vine fixes and tweaks
2015-12-04 21:40:33 +00:00
7560562269
Well okay SHORT delay then
2015-12-04 16:32:41 -05:00
2624e23b95
mergefix
2015-12-04 16:20:21 -05:00
f97ca7f7c8
im good at what i do
2015-12-04 15:37:53 -05:00
0ccbe76a7a
Merge pull request #13402 from AnturK/pressme
...
Minor button upgrades
2015-12-04 22:21:48 +03:00
d4395f6122
Merge pull request #13419 from neersighted/sstimer_fix
...
Fix error in SStimer arguments
2015-12-04 21:57:47 +03:00
7037877028
Merge pull request #13420 from AnturK/outofideas
...
Removes unused virus var
2015-12-04 21:57:24 +03:00
87976c358f
Merge pull request #13411 from Anonus/ghostexamine
...
Removes delay on examining objects that also have a nanoui interface as a ghost
2015-12-04 15:58:19 +00:00
82e2ae85e9
Automatic changelog generation for PR #13403
2015-12-04 15:57:38 +00:00
7469ed2263
Merge pull request #13403 from Anonus/mmnerf
...
Magic missile no longer does damage
2015-12-04 15:57:37 +00:00
b5dcce5fc1
Merge pull request #13416 from Razharas/InjectFix
...
Fixes injector in incinerator on box
2015-12-04 11:11:46 -03:00
a5f0f3f594
changes spawn() throw_at to throw_at_fast set waitfor = 0
...
Set waitfor = 0 has massively less overhead then spawn() but still does basically the same thing.
It causes the first sleep in the stack from that point on to make the set waitfor = 0 proc return . then continue on as if it was spawn()'ed, but it doesn't have to copy over the local vars of the proc so a lot less overhead
http://pastebin.com/kx538RqS
2015-12-04 04:37:16 -08:00
544295c563
define proc/refreshID
2015-12-04 03:42:54 -06:00
f3f61367da
Give wallets merged access of all IDs inside.
2015-12-04 03:16:43 -06:00
c1ad583a30
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-12-04 11:38:56 +03:00
b7ac187616
Merge branch 'MMMiracles-madewithrealcaverock'
2015-12-04 11:36:46 +03:00
2ffd532d5e
Merge pull request #13439 from paprka/remiepls
...
Manual Merge of #12820
2015-12-04 02:22:28 -06:00
b4ddc0abb3
Merge branch 'madewithrealcaverock' of https://github.com/MMMiracles/-tg-station into MMMiracles-madewithrealcaverock
2015-12-04 11:17:49 +03:00
717b857401
Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls
...
Conflicts:
code/datums/beam.dm
icons/mob/animal.dmi
tgstation.dme
2015-12-03 23:20:12 -08:00
Remie Richards
duncathan salt
Nerd Lord
Kyle Spier-Swenson
Razharas
sybil-tgstation13
tgstation-server
Jordie
octareenroon91
MMMiracles
Aranclanos
KorPhaeron
Razharas
Cheridan
paprka