Zuhayr
d466d740e4
Merge pull request #7886 from Baystation12/dev-freeze
...
Updating from dev freeze
2015-01-20 18:49:36 +10:30
Zuhayr
aa5013fa08
Merge pull request #7885 from Baystation12/master
...
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Ccomp5950
d836103b22
Merge pull request #7860 from mwerezak/unarmed
...
Unarmed attack log message tweaks
2015-01-18 17:42:47 -05:00
mwerezak
15c7ed92e4
Unarmed message tweaks
2015-01-17 03:26:19 -05:00
Chinsky
9890bdc86d
Merge pull request #7851 from Baystation12/dev-freeze
...
Dev freeze -> dev
2015-01-16 14:24:06 +03:00
Chinsky
6e7eb38c5d
Merge pull request #7850 from Baystation12/master
...
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
facfc0df56
Fixes #7560
2015-01-16 12:51:46 +03:00
Chinsky
b405fcd71f
Fixes #7775
2015-01-16 12:26:05 +03:00
Chinsky
c2b5c53092
Merge pull request #7845 from Ravensdale/runtimeFixes
...
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Ravensdale
fdf9886053
Fixes Cannot execute null.on removed()
2015-01-15 14:48:04 -08:00
Chinsky
1c772e9914
Fixes #7821
2015-01-15 16:45:45 +03:00
PsiOmega
5c6c65e728
Can no longer see the AI eye by right or alt-clicking turfs.
2015-01-15 10:25:49 +01:00
Loganbacca
cac7f64fdc
Robot module fix
...
Thanks mwerezak
2015-01-13 22:16:20 +13:00
Loganbacca
5d0d5d0aba
Fixes robot modules not regenerating
...
- Also added a type check
2015-01-13 16:34:15 +13:00
PsiOmegaDelta
476ac0e530
Merge pull request #7765 from sirbayer/fastxenoborg
...
Borg iconupdate fix & cleanup
2015-01-12 11:54:52 +01:00
Zuhayr
d65c8f366e
Merge pull request #7791 from Baystation12/dev-freeze
...
Dev freeze
2015-01-12 09:05:45 +10:30
Zuhayr
61d35bd474
Merge resolution.
2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3
Blood/oil stain fixes
...
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
Loganbacca
baf763c324
Runtime fix
2015-01-11 19:01:38 +13:00
mwerezak
0c9107afff
Fixes hostile simple mobs targeting distant mechs
2015-01-09 21:36:44 -05:00
sirbayer
7a760298af
Further repairs borg updateicon() code for improved modularity.
2015-01-09 18:17:51 -08:00
sirbayer
f193791f8c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fastxenoborg
2015-01-09 17:10:35 -08:00
Zuhayr
a539780086
Merge pull request #7759 from Baystation12/dev-freeze
...
Dev < Dev freeze
2015-01-10 04:58:48 +10:30
sirbayer
69da785b3c
Fixes combat borg icon state breaking and turning borgs invisible; adds some modularity to the general borg icon_state situation.
2015-01-08 22:53:47 -08:00
Zuhayr
6a6332437a
Merge pull request #7750 from Amunak/patch-1
...
Reverted "say error helper" before there is a better implementation or option to toggle it
2015-01-09 14:11:05 +10:30
Amunak
8fa2fdb51b
Reverted "say" error helper
...
Commented out the "say error helper" before we have a better implementation or before it can at least be toggleable. Current state doesn't fit way too many edge casess.
2015-01-09 03:56:58 +01:00
Zuhayr
5bbe1ecaa8
Amends nymph pulling fix to add higher w_class. Adds fail messages to pAI and nymphs trying to drag non-items.
2015-01-09 08:59:38 +10:30
Zuhayr
683c8b50a8
Fixes #7702
2015-01-09 08:09:46 +10:30
Zuhayr
7c88b54404
Fixes #7722
2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e
Fixes #7726
2015-01-09 06:44:09 +10:30
Zuhayr
7e0610e31c
Fixes #7684
2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd
Fixes #7720
2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03
Fixes #7701
2015-01-09 04:05:11 +10:30
Zuhayr
29435d8750
Fixes #7700
2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c
Fixes #7691
2015-01-09 03:51:47 +10:30
ccomp5950
27765f799f
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflict resolution.
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr
66759eff3c
Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text.
2015-01-06 11:11:34 +10:30
Kelenius
4c63e6a3ea
Restores monkey's ability to ventcrawl
...
Fixes #7474 .
2015-01-03 22:41:57 +03:00
Zuhayr
982998d08d
Fixes #7636
2015-01-03 06:53:29 +10:30
Chinsky
5e0676df49
Merge pull request #7631 from Zuhayr/dev-freeze
...
More fixes.
2015-01-02 20:52:27 +03:00
Loganbacca
f3b893942f
More cargo train fixes
...
- Fixes #5906
- Fixes #5939
- Fixes #6282
- Fixes #6634 (properly this time)
- Fixed a bug with updating train stats (causing trains to be super slow if hitched while running)
- Updated train verbs (start/stop/remove key) to only show up if you are in the same turf
- Moved all train specific verbs to their own verb category: "Vehicle"
2015-01-03 01:27:10 +13:00
Zuhayr
e63798ea4e
Fixes oversight with decompiler.
2015-01-02 20:42:59 +10:30
Zuhayr
261f3f935c
Fixes #7627
2015-01-02 19:19:01 +10:30
Zuhayr
89955dbb36
Fixes #7628
2015-01-02 19:02:11 +10:30
Zuhayr
041cd3f3f3
Fixes #7629
2015-01-02 18:58:52 +10:30
Zuhayr
6cae51a945
Fixes #7625
2015-01-02 18:48:06 +10:30
Zuhayr
5b578a1668
Merge resolution.
2015-01-01 22:59:54 +10:30
Loganbacca
dbeec8915e
Cargo train fixes
...
- Partial fix for #6634
- Fixes #7414
- Fixes #7609
2015-01-02 00:05:47 +13:00
Zuhayr
cdfa2a5205
Merge pull request #7586 from Zuhayr/dev-freeze
...
Fixes the remainder of #7567 , plus other fixes.
2014-12-31 22:48:39 +10:30
PsiOmegaDelta
12053e739c
Merge pull request #7590 from mwerezak/walls
...
Less wall and door destruction snowflake, allows obj to damage walls
2014-12-31 11:29:28 +01:00
