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
234273605e
Merge pull request #8271 from PsiOmegaDelta/AlertMe
...
Fixes #8266 .
2015-02-26 16:28:26 +10:30
d98eb1c823
Merge pull request #8289 from MrSnapwalk/actionfigurefix
...
Fixes action figures not randomizing properly.
2015-02-26 16:26:37 +10:30
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
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06: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
a910986ed4
Merge pull request #8272 from PsiOmegaDelta/NanoLimit
...
Fixes #8258 .
2015-02-25 16:13:22 -08:00
f2432bb104
Merge pull request #8273 from PsiOmegaDelta/HoloMap
...
Map fixes.
2015-02-25 15:34:08 -08: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
c61a60c064
Map fixes.
...
Fixes one of the holodeck issues mentioned in #8267 . Was unable to reproduce the failure to load the basketball simulation.
Fixes a problem in the vault where the a crate of gold had been replaced with a vault door instead.
2015-02-25 19:22:45 +01:00
dfd83f787a
Fixes #8258 .
...
Main correction is the removal of Topic() in code/game/machinery/computer/computer.dm.
Issue introduced in #7617 where I stated multiple times this Topic()-return value was incorrect.
Ensures that computers return the correct value after the ..() check.
2015-02-25 09:47:50 +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
9782140d32
Resolves #8236
...
Lasers deal more damage to grilles, and clicking directly on the grille
makes it more likely for the grille to absorb the projectile.
2015-02-25 00:14:42 -05:00
ae6466ac45
Examining the Z8 now shows what is loaded in the grenade launcher.
2015-02-25 00:14:02 -05:00
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
00848f1a48
Merge pull request #8251 from GinjaNinja32/shuttlefix
...
Fixes shuttles. All of them.
2015-02-24 22:16:48 +03:00
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
a1afc3a48a
Merge pull request #8235 from PsiOmegaDelta/HoldIt
...
Fixes #8234
2015-02-25 05:45:54 +10:30
86243b97fd
Fixes shuttles. Yes, all of them.
2015-02-24 19:15:16 +00:00
35dffc934d
Merge pull request #8233 from Neerti/2-24-2015_fixes_desc_bug
...
Fixes some examine bugs.
2015-02-24 16:16:23 +01:00
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
4c3dcb5aa6
Merge pull request #8225 from Neerti/removes_the_fun
...
Fixes #8222
2015-02-24 12:28:34 +01:00
afb7f7eff7
Fixes #8223 .
...
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
917bad5d5b
Removes all the fun from buckling.
2015-02-24 06:15:44 -05:00
030deb4556
Merge pull request #8163 from Baystation12/dev
...
Dev-freeze 0.1.18
2015-02-24 11:53:07 +03:00
e6abfc01f6
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-02-24 10:54:17 +03:00
9f5deb2697
Merge pull request #8038 from Zuhayr/xenohydro
...
Hydroponics rewrite, kitchen changes.
2015-02-24 10:34:08 +03:00
8fc4b31238
Updated changelog.
2015-02-24 18:02:03 +10:30
391ddd970e
Resolves remaining issues with xenohydro PR.
2015-02-24 17:55:39 +10:30
988b8f8b86
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
maps/exodus-1.dmm
2015-02-24 09:36:50 +03:00
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
11a55faeaf
Merge pull request #8127 from PsiOmegaDelta/SuppliesOfTheGodfather
...
New traitor items - Part II
2015-02-24 04:38:33 +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
d8245540ef
Restores silicon alarm notices.
2015-02-23 21:29:00 +01:00
c55f807b42
Removes random Telecrystal grants, instead increases the start amount by 2.
2015-02-23 20:56:48 +01:00
b38d8495b3
Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
...
Conflicts:
code/game/gamemodes/game_mode.dm
code/modules/clothing/spacesuits/rig/suits/merc.dm
2015-02-23 17:38:50 +01:00
Zuhayr