Commit Graph

20270 Commits

Author SHA1 Message Date
Rob Nelson
71c1383724 Fixed #6101 - Monkeys and other animals now speak gibberish again. 2015-10-13 20:22:13 -07:00
D3athrow
ea2b5c4aaa Bad tabs ahead kiddo 2015-10-13 19:04:19 -05:00
D3athrow
42447e3139 cap internal bleeding wounds at 1 per organ 2015-10-13 18:36:38 -05:00
Rob Nelson
1beab8e146 Merge pull request #6106 from DeityLink/aipda
Fixes #6103
2015-10-13 13:12:53 -07:00
Rob Nelson
d2c8fba62f Merge pull request #6111 from DeityLink/traylid
Fixes #6044
2015-10-13 13:02:57 -07:00
Rob Nelson
42c4866fed Merge pull request #6109 from DeityLink/buckledportal
Fixes #6047
2015-10-13 13:02:51 -07:00
Rob Nelson
e535a60ff4 Merge pull request #6108 from DeityLink/spraynpray
Fixes #6083
2015-10-13 13:02:44 -07:00
Rob Nelson
d40f111501 Merge pull request #6107 from DeityLink/ATMlogout
Fixes #6105
2015-10-13 13:02:39 -07:00
Rob Nelson
cc735ee57c Fixes #6110: MMIs do proper sanity checks, removed runtime ops. 2015-10-13 10:46:28 -07:00
DeityLink
b3ae0eb5a3 fixes #6044 2015-10-13 16:18:15 +02:00
DeityLink
ebb08f9b87 fixes #6047 2015-10-13 15:44:04 +02:00
DeityLink
3caed0c410 fixes #6083 2015-10-13 15:29:00 +02:00
DeityLink
5162e9d1c6 fixes #6105 2015-10-13 15:22:36 +02:00
DeityLink
8444c9a28a can't send money to silicons 2015-10-13 14:55:28 +02:00
Rob Nelson
4e3a459aa4 Fix special voice formatting (sans, siliconsay) not applying to radio messages. 2015-10-13 00:15:37 -07:00
Rob Nelson
b0b9a23388 Fix issues with quotation marks. 2015-10-12 20:48:32 -07:00
Rob Nelson
b35d5fc142 Fix double-encoding deadchat 2015-10-12 20:42:32 -07:00
Rob Nelson
c468e0a8c0 Fixes #6087 2015-10-12 19:01:11 -07:00
Rob Nelson
17877acb3b Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-12 18:03:24 -07:00
Rob Nelson
6560317d17 Fix mob say_quote() not being used when lang is null.
Fixes #6094
2015-10-12 18:02:54 -07:00
Rob Nelson
5c14f2b142 Merge pull request #6084 from Kurfursten/wiretweaks
Wires and wire holders
2015-10-12 16:41:18 -07:00
Rob Nelson
0fc487ee35 Merge pull request #6086 from FudgePucker/patch-3
Fixes #6063
2015-10-12 16:40:39 -07:00
Rob Nelson
0eb26d9882 Merge pull request #6088 from unid15/master
Bugfixes, carp in-hands, MoMMIs can edit blueprint areas
2015-10-12 16:39:54 -07:00
Kurfursten
2a05f79e9b hotfix 2015-10-12 18:04:00 -05:00
unid15
762dac35db memes 2015-10-12 18:42:54 +02:00
FudgePucker
0b2bd6a402 Fixes #6063
Just one line change.
2015-10-12 11:14:29 -04:00
dylanstrategie
52a1f1499e Hotfix to glove sprites 2015-10-12 09:12:04 +02:00
Kurfursten
e432ca0abc Wires and wire holders 2015-10-12 02:09:56 -05:00
Rob Nelson
7f6b8df611 Fix #5987, in theory. 2015-10-11 22:40:24 -07:00
Rob Nelson
3c6848cb64 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-11 21:17:51 -07:00
Rob Nelson
83d27c3573 Fixes #6073 probably 2015-10-11 21:17:14 -07:00
Rob Nelson
00f7620583 Merge pull request #5540 from Kurfursten/treadmill
Treadmill Generator
2015-10-11 21:06:29 -07:00
Rob Nelson
e3b30dd68b Merge pull request #6080 from Kurfursten/mechanicupdate
Mechanic Update
2015-10-11 21:05:56 -07:00
Kurfursten
82e37f0aad Added mob speeds, new sprite 2015-10-11 22:47:39 -05:00
Kurfursten
dbb9105d4a Now with R&D 2015-10-11 22:46:06 -05:00
Kurfursten
24cfbe0136 Treadmill Generator 2015-10-11 22:46:04 -05:00
Rob Nelson
2f4dc8d898 Merge pull request #6081 from dylanstrategie/Window
Update window spanclasses
2015-10-11 20:29:59 -07:00
Rob Nelson
36029d4618 Merge pull request #6078 from dylanstrategie/Infest
Fix Infestation event to actually work
2015-10-11 20:29:47 -07:00
Rob Nelson
3f7c824918 Merge pull request #6068 from DeityLink/tempay4colleg
The "Economy" update, part 1
2015-10-11 20:29:01 -07:00
Kurfursten
551d037dc5 We are not your kind of people 2015-10-11 22:21:57 -05:00
dylanstrategie
97bf97a3e3 Update window spanclasses 2015-10-12 05:14:14 +02:00
Rob Nelson
3a4ba2cdce Merge pull request #6040 from N3X15/tcomms-rework
Saycode Rework
2015-10-11 20:02:12 -07:00
Rob Nelson
56b54e80ef Merge pull request #6077 from Arthurdentist/randd
Lets you build Antibody Scanners at R&D
2015-10-11 18:37:14 -07:00
Rob Nelson
6ee99449dd Merge pull request #6072 from PJB3005/AI-AAC
Fixes #6041
2015-10-11 18:35:25 -07:00
dylanstrategie
6f56c692ba Fix Infestation event to actually work 2015-10-12 03:34:30 +02:00
Arthurdentist
ccf80ac212 Antibody Scanner 2015-10-11 23:56:17 +01:00
Rob Nelson
7f5f0d3138 Log borer chem injection. 2015-10-11 14:30:14 -07:00
Rob Nelson
6b11d2e997 Merge pull request #6059 from dylanstrategie/Shower
Rework Showers
2015-10-11 11:16:17 -07:00
Rob Nelson
45d237c16a Merge pull request #6060 from dylanstrategie/Mine-Surprise
Use ChangeTurf for Mining Surprises
2015-10-11 11:15:36 -07:00
Rob Nelson
9d0d5cf06a Merge pull request #6061 from dylanstrategie/Suit-Sensors
Tacticool Turtlenecks now have suit sensors, which are off by default
2015-10-11 11:15:12 -07:00