7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
2c032cacaf
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-27 09:52:51 +01:00
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
12024f07aa
gets rid of MC tab. Returns it back to status tab.
2015-02-26 15:32:10 -08:00
8483d7c679
Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon
2015-02-26 18:46:10 +00:00
98f6a4cae5
Camera coverage fixes.
...
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
2015-02-26 11:39:41 +01:00
3ba56d7f76
Alt-arrow in same direction you are set to face now resets facing direction.
2015-02-26 11:56:43 +03:00
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
f14922f1f8
Merge pull request #8288 from mwerezak/topicfix
...
Topic Fixes
2015-02-26 16:28:56 +10:30
a9d23df3ff
Merge pull request #8279 from PsiOmegaDelta/CameraNet
...
Fixes camera network changes not always being reflected in camera consoles.
2015-02-26 16:28:49 +10:30
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
0e80242e92
Merge pull request #8212 from PsiOmegaDelta/CleanTopic
...
Minor NanoUI/Topic cleanup
2015-02-26 16:27:08 +10:30
d06b2a0a12
EMP briefly blocks switching/engaging modules
2015-02-26 00:05:04 -05:00
ec59f8ab07
Fixes captain's laser gun
...
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
768faa4bf0
Fixes #8266 .
...
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
2015-02-25 09:07:04 +01:00
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00
b067b491a4
Returns the laser carbine capacity to 10
2015-02-25 00:15:08 -05:00
ae6466ac45
Examining the Z8 now shows what is loaded in the grenade launcher.
2015-02-25 00:14:02 -05:00
b806b2d29b
Merge pull request #8209 from mwerezak/ninja
...
Ninja rebalancing
2015-02-25 14:15:32 +10:30
3e71802a52
Replaces colt signal pistol with a Mk58 version.
...
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
2015-02-24 21:23:19 -05:00
944be58804
Adjusts sniper rifle damage
...
Lowers wall pierce chance back to original value to compensate, and
increase the cost of ammo by 1 TC.
2015-02-24 20:45:40 -05:00
401709cd23
Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite
2015-02-24 20:15:18 -05:00
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08:00
5124055663
Fixes #8243
...
Didn't want to have to generate even more lists so this is what you get.
2015-02-24 19:42:24 -05:00
404c8886da
Fixes #8230
2015-02-24 19:37:49 -05:00
d4870b80ee
Assorted Fixes
...
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
a1afc3a48a
Merge pull request #8235 from PsiOmegaDelta/HoldIt
...
Fixes #8234
2015-02-25 05:45:54 +10:30
b3b7ed06cd
Fixes #8234
...
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
2c8c4a2327
Fixes some misc examine bugs.
2015-02-24 07:42:06 -05:00
488c25ae73
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-24 13:09:05 +01:00
391ddd970e
Resolves remaining issues with xenohydro PR.
2015-02-24 17:55:39 +10:30
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
4f86f69808
Fixes missing return that made all bullets pass through mobs
2015-02-23 22:28:37 -05:00
b73d541c65
Merge pull request #8155 from PsiOmegaDelta/subsystems
...
Centralized Alarm Handling
2015-02-24 04:39:48 +03:00
3940c35184
Misc gun tweaks
2015-02-23 18:25:22 -05:00
e540550cff
Adds an underslung grenade launcher to the Z8.
2015-02-23 17:56:54 -05:00
65a32ec051
A stab at ninja rebalancing
...
They're still pretty deadly, they have a lot of tools at their disposal,
they can kill someone in a couple of clicks with their energy blade.
However hopefully they will have to pick their fights now.
2015-02-23 16:48:45 -05:00
09f15f98f2
Merge pull request #8215 from GinjaNinja32/language
...
Fixes a few issues with noise-language.
2015-02-24 07:49:37 +10:30
d8245540ef
Restores silicon alarm notices.
2015-02-23 21:29:00 +01:00
e47c45591c
Fixes a few issues with noise-language.
2015-02-23 18:58:41 +00:00
f510c38d22
Alarm centralization completion
...
Atmosphere alarms now handled centrally.
2015-02-23 15:11:13 +01:00
220d029baf
Merge pull request #8195 from mwerezak/rigfix
...
Fixes a suit breach issue and hardsuit emp handling
2015-02-23 16:52:07 +03:00
a2cd104cc9
Alarm centralization completion
...
Fire alarms now handled centrally.
2015-02-23 13:28:19 +01:00
b5dda2b793
Merge pull request #8180 from mwerezak/mercenary
...
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
93b049e7a6
Alarm centralization completion
...
Ensures the master area is always used, to avoid issues caused by dynamic lightning which splits areas into sub-areas.
Power alarms now handled centrally.
2015-02-23 11:23:23 +01:00
1c763ff2c9
Merge remote-tracking branch 'upstream/dev' into subsystems
2015-02-23 10:32:32 +01:00
5578afa07c
General update.
...
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
2015-02-23 10:32:25 +01:00
eb5e5aa0ba
Minor NanoUI/Topic cleanup
...
The default state handler is now assigned as the default argument value, instead of having to utilize null-checks.
2015-02-23 10:23:40 +01:00
Chinsky