PsiOmega
3d54ca52d2
Attempts to improve camera tracking.
...
Ensures that the list of trackable mobs and whether a mob can still be tracked utilizes the same logic.
Generally attempts to cleanup the tracking logc.
2015-01-15 10:16:32 +01:00
PsiOmegaDelta
476ac0e530
Merge pull request #7765 from sirbayer/fastxenoborg
...
Borg iconupdate fix & cleanup
2015-01-12 11:54:52 +01:00
Zuhayr
0fff3b4dda
Merge pull request #7798 from Baystation12/dev-freeze
...
Dev freeze into dev
2015-01-12 21:17:25 +10:30
Zuhayr
7866d78b4b
Merge pull request #7797 from Baystation12/master
...
Master into dev-freeze
2015-01-12 21:17:04 +10:30
tkdrg
2d2c376f2f
Fixes XSS vuln in changeling mimic voice
...
See https://github.com/tgstation/-tg-station/issues/6975
2015-01-11 19:54:42 -03:00
Zuhayr
d65c8f366e
Merge pull request #7791 from Baystation12/dev-freeze
...
Dev freeze
2015-01-12 09:05:45 +10:30
Zuhayr
9f7df7045e
Merge pull request #7771 from GinjaNinja32/robot_storage
...
Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor.
2015-01-12 07:39:49 +10:30
ginjaninja32
4717c3a575
Span classes? Span classes.
...
Also removes a pair of redundant \impropers.
2015-01-11 21:00:03 +00:00
Zuhayr
61d35bd474
Merge resolution.
2015-01-12 07:17:02 +10:30
GinjaNinja32
30cb5f5cc7
Revert test code
2015-01-11 12:29:14 +00:00
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
PsiOmega
b9fa2c0c50
Fixes #7663 .
...
Corrects inconsistent turret anchor/on settings.
Correctly sets access ERT turret permissions.
Corrects invisibility level on turret pop down.
2015-01-11 12:21:45 +01:00
Zuhayr
6db4cef894
Merge pull request #7784 from PsiOmegaDelta/Shutters
...
Fixes #7723 .
2015-01-11 21:10:25 +10:30
PsiOmega
4a68f6097d
Fixes #7743 .
...
Makes syndicate and vox shuttle areas radiation safe.
2015-01-11 11:28:24 +01:00
PsiOmega
7f54ff97ef
Fixes #7723 .
...
Blast doors again use the same layering method as doors.
2015-01-11 11:20:51 +01:00
Loganbacca
a53922307b
Fixed lying mobs not updating gravity state
...
Also removed a few colons from turf.dm
2015-01-11 22:43:15 +13:00
Loganbacca
bc57c8b55d
Made thaler bundle merging code more sane
...
Both bundles are dropped, then the merged one is put in the users hands
2015-01-11 21:44:12 +13:00
Loganbacca
146fb2f6ad
Fixes lighting not updating when turfs are changed
2015-01-11 21:03:27 +13:00
Loganbacca
441ee30bfb
Fixes multiplying grape soda
...
Also cleaned up some indenting
2015-01-11 19:14:59 +13:00
Loganbacca
baf763c324
Runtime fix
2015-01-11 19:01:38 +13:00
Chinsky
4b3ffa864c
Merge pull request #7768 from mwerezak/fixes
...
Fixes
2015-01-10 21:24:13 +03:00
ginjaninja32
1936410a91
Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor.
2015-01-10 04:15:55 +00:00
mwerezak
905a832957
Fixed #7763
2015-01-09 22:28:16 -05:00
ccomp5950
2816d3c02b
Fixes PDA locking up after receiving a " in conversation.
...
Long story short, the json encoding doesn't know how to handle "
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -05:00
Amunak
0d87cb3d4d
Fixes typo in engineering research description
...
It has been there since, like, forever.
2015-01-10 04:25:50 +01: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
PsiOmegaDelta
4735419c6f
Merge pull request #7741 from Tramziller/Bugfixes
...
Response to #7724
2015-01-08 23:29:46 +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
fd311a412f
Fixes #7742 .
2015-01-09 08:58:11 +10:30
Zuhayr
f43f58380c
Fixes #7703
2015-01-09 08:26:53 +10:30
Zuhayr
683c8b50a8
Fixes #7702
2015-01-09 08:09:46 +10:30
Tramziller
11ff174636
Old link was replaced by new one
2015-01-08 22:26:31 +01:00
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
a01592d5b7
Fixes #7740
2015-01-09 06:25:27 +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
b36b41a2f5
Fixes #7656
2015-01-09 03:58:43 +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
Zuhayr
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
mwerezak
08cda65973
Adjusts major event weightings
2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7
Fixes meteor event
2015-01-07 23:29:52 -05:00
