Commit Graph

20602 Commits

Author SHA1 Message Date
clusterfack
db6597cf59 Merge pull request #6366 from DeityLink/fixgoldmonsters
Bunch o' hostile mobs fixes and refactoring
2015-11-04 02:01:24 -06:00
Rob Nelson
44e3e5e30e Maybe fix welderfuel again 2015-11-03 23:52:04 -08:00
DeityLink
6ccb41107d missing slash 2015-11-04 08:24:10 +01:00
Rob Nelson
83de6f58ce Fixes #6402 maybe 2015-11-03 19:35:51 -08:00
Rob Nelson
b93c2af227 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-11-03 19:19:16 -08:00
Rob Nelson
ac8d247fe3 Fixed #6421 and logged illegal weapons modules. 2015-11-03 19:18:27 -08:00
Rob Nelson
1ab199d3b0 Merge pull request #6420 from 9600bauds/withthispowerishallbuildthefoundationofmyempire,athousandpapercranes
Fixes #6417, fixes being able to pick up paperbins through windows
2015-11-03 18:56:46 -08:00
Rob Nelson
e56a551ae0 Merge pull request #6425 from FudgePucker/patch-5
Adds a small addition to lazarus injectors desc
2015-11-03 18:52:38 -08:00
Rob Nelson
31702ee274 Minor fixes. 2015-11-03 18:49:51 -08:00
Rob Nelson
2985d35bda Fixes #6422, fixes #6378 2015-11-03 18:49:02 -08:00
Rob Nelson
27f897dad8 Should fix #6116 2015-11-03 18:39:59 -08:00
d3athrow
8917e53a47 Merge pull request #6410 from DeityLink/Bleeding-Edge
Fixing stuff
2015-11-03 14:02:39 -06:00
FudgePucker
d80715abc8 Adds a small addition to lazarus injectors desc 2015-11-03 14:49:25 -05:00
DeityLink
0c919efbdb better 2015-11-03 20:42:54 +01:00
9600bauds
9fac729080 Puts paper bins on hand when mousedropped over your hand slot + fixes being able to pick up paper bins through windows 2015-11-03 02:11:24 -03:00
Cyadox
55dc821163 Seriously 2015-11-02 23:56:59 -05:00
d3athrow
9269914fcd Merge pull request #6418 from 9600bauds/goofballsunendingcurse
HOTFIX: Disables recursive food by default
2015-11-02 21:57:00 -06:00
9600bauds
c2eabe13c7 Disables recursive food by default 2015-11-03 00:25:51 -03:00
DeityLink
61839e93c8 fixin stuff 2015-11-02 14:27:01 +01:00
Rob Nelson
c5bf2c5834 Merge pull request #6386 from unid15/spaky_skeletal
Better default ghost icon
2015-10-30 21:04:21 -07:00
Rob Nelson
308f957ffa Merge pull request #6393 from Faptastic/ViroFix
bugfix the disease analyser and tweaked viro machine interfaces.
2015-10-30 21:04:12 -07:00
Faptastic
7ce929377a bugfix the disease analyser and update viro machine interfaces. 2015-10-31 01:57:13 +00:00
Rob Nelson
0bb76e9351 Fixes #6385 2015-10-30 14:23:15 -07:00
Rob Nelson
9162d1a82a Merge pull request #6388 from dylanstrategie/Health-Anal-Adj
Move blood loss display back to previous
2015-10-30 13:41:13 -07:00
Rob Nelson
4df43b8a84 Merge pull request #6390 from unid15/linganinga
Fixes changeling monkeys being unique snowflakes with a special name
2015-10-30 13:30:03 -07:00
unid15
5f3f9ed806 changeling monkeys look like normal monkeys 2015-10-30 21:17:46 +01:00
clusterfack
5ad27cc292 Fix runtime 2015-10-30 14:47:15 -05:00
dylanstrategie
47f0973446 Move blood loss display back to previous 2015-10-30 20:45:47 +01:00
unid15
301d9bc06c better default ghost icon 2015-10-30 19:05:31 +01:00
DeityLink
bf877e23df replacetext 2015-10-30 15:11:40 +01:00
Rob Nelson
89253ac0bf Merge pull request #6379 from DeityLink/snimalstunfix
Fixed hostile mobs chasing their targets when they shouldn't be able to move
2015-10-30 02:21:42 -07:00
clusterfack
aac6d1a92d Fix More Runtimes and other things 2015-10-30 03:04:36 -05:00
DeityLink
ad02d078ba hostile canmove 2015-10-30 03:16:23 +01:00
DeityLink
61516afbb8 improving 2015-10-30 02:22:58 +01:00
Rob Nelson
ecba0e5b41 Fixes #6372, fixes changelog 2015-10-29 17:53:46 -07:00
Rob Nelson
39c7ce3c6a Fixes #6368 2015-10-29 17:31:15 -07:00
Rob Nelson
cbf6f08ab2 Fixes #6129 2015-10-29 17:20:06 -07:00
Rob Nelson
5116dc3092 Merge pull request #6361 from PJB3005/browsing-the-cache
Fixes the asset cache.
2015-10-29 15:46:16 -07:00
Rob Nelson
4ebce88580 Merge pull request #6373 from Zth--/cancelButtons
Cancel buttons for cyborgs
2015-10-29 15:45:30 -07:00
PJB3005
dd82974ba1 Fixes for RPD & RCD code.
* Fixed calling of select() from the base RCD class.
* Fixed pipe layer adapters in the RPD, Fixes #6318.
* Made pipe layers stay when you switch beween pipe schematics.
* Fixed the pipe layer selector not loading if you didn't select the straight pipes first.
* Fixed bent pipes not having a correct dir selected initially.
* Fixed disposals pipes having an (unusable) layer selector in the RPD.

Fix for the silicate sprayer.
* Silicate sprayer now says if it's out of silicate, Fixes #6367.
2015-10-29 23:08:51 +01:00
PJB3005
bbd403235f Fixes the asset cache. 2015-10-29 23:01:25 +01:00
Zth
bc66bc5ecd more cancel buttons 2015-10-29 13:21:00 -03:00
Zth
e9152257bc cancel buttons 2015-10-29 13:17:13 -03:00
DeityLink
fd5b0115f6 text2path is bretty cool 2015-10-29 11:24:03 +01:00
DeityLink
08481450ed simple animal shenanigans 2015-10-29 03:39:02 +01:00
DeityLink
be270d6379 renaming metroid file/folder to slime 2015-10-29 02:20:41 +01:00
DeityLink
a53c33e063 fixing shit 2015-10-29 02:19:20 +01:00
clusterfack
038130b573 Merge pull request #6358 from FudgePucker/patch-4
Fixes #4037
2015-10-28 19:26:36 -05:00
D3athrow
ea0f3a8343 unban panel ooc ban desc 2015-10-28 18:33:29 -05:00
FudgePucker
ab60f295fa Fixes #4037
Fixes #4037
2015-10-28 09:07:13 -04:00