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
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
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
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
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01: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
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
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08: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
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
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
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
b73d541c65
Merge pull request #8155 from PsiOmegaDelta/subsystems
...
Centralized Alarm Handling
2015-02-24 04:39:48 +03: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
5be726753f
Updates paths after the projectile update. Adds rig modules to the uplink.
2015-02-23 17:33:12 +01:00
4659415af2
Atmospheric computer NanoUI interface.
2015-02-23 17:14:20 +01:00
d66f4457a1
Merge pull request #8211 from PsiOmegaDelta/Starlight
...
Ports /tg/'s starlight luminance.
2015-02-24 02:19:50 +10:30
f510c38d22
Alarm centralization completion
...
Atmosphere alarms now handled centrally.
2015-02-23 15:11:13 +01: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
bbbde676d5
Merge pull request #8200 from mwerezak/devfixes
...
Misc dev updates
2015-02-23 10:15:42 +01:00
5023fa4000
Ports /tg/'s starlight luminance.
...
Because configuration is initialized before the map we also don't have the same runtimes issues corrected by https://github.com/tgstation/-tg-station/pull/7806 .
2015-02-23 10:11:46 +01:00
6c4d16774f
Merge remote-tracking branch 'upstream/dev' into mercenary
...
Conflicts:
code/game/objects/items/devices/uplinks.dm
2015-02-22 20:44:43 -05:00
115bbbe669
Nerfs merc sniper rifle and makes it uplink purchasable
...
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
2015-02-22 20:27:06 -05:00
c317fb8c39
Adds ability for uplink purchases to produce more than one item
2015-02-22 20:17:18 -05:00
58ff042fc8
Merge pull request #8197 from mwerezak/mecha-airlocks
...
Allows exosuits to interface with adjacent airlock controllers and buttons
2015-02-22 16:50:06 +01:00
79917d57b2
Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
...
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
2d03c412f7
Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor
...
Examine Tab 2: Revenge of the Refactor: Reloaded
2015-02-22 11:32:32 +03:00
3900b90abc
Merge pull request #8203 from Baystation12/master
...
Master into dev.
2015-02-22 18:24:47 +10:30
d0ca48cd25
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:16 +10:30
28e7411e2d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:06 +10:30
2fcf8d51f4
Allows exosuits to interface with adjacent airlock controllers and buttons.
2015-02-21 20:54:01 -05:00
47cbfdd59e
Keeps zone selection and gun mode toggle HUD elements visible when scoped
2015-02-21 16:01:47 -05:00
11719a380e
Fixes #8151
2015-02-21 15:49:52 -05:00
ca6448fa4c
Fixes #8192
2015-02-21 12:11:40 +00:00
14f8e3beac
Numerous kitchen changes in tandem with prior commit. Removed processor.
2015-02-21 22:24:01 +10:30
9ad9f19a0b
Transitioning back to using flour as a reagent. Sorry RKF.
2015-02-21 22:04:32 +10:30
4daf7161ad
Merge pull request #8191 from PsiOmegaDelta/NanoFix
...
Fixes runtime in Topics() when called from non-NanoUI sources.
2015-02-21 14:34:09 +03:00
Zuhayr