PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
Zuhayr
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
Zuhayr
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
Zuhayr
0e80242e92
Merge pull request #8212 from PsiOmegaDelta/CleanTopic
...
Minor NanoUI/Topic cleanup
2015-02-26 16:27:08 +10:30
mwerezak
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
MrSnapwalk
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06:00
PsiOmega
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
PsiOmegaDelta
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00
mwerezak
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
mwerezak
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
Snapshot
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08:00
Raptor1628
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
Zuhayr
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
PsiOmega
afb7f7eff7
Fixes #8223 .
...
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
Neerti
917bad5d5b
Removes all the fun from buckling.
2015-02-24 06:15:44 -05:00
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
PsiOmega
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
PsiOmega
5be726753f
Updates paths after the projectile update. Adds rig modules to the uplink.
2015-02-23 17:33:12 +01:00
Chinsky
b5dda2b793
Merge pull request #8180 from mwerezak/mercenary
...
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
PsiOmega
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
PsiOmegaDelta
bbbde676d5
Merge pull request #8200 from mwerezak/devfixes
...
Misc dev updates
2015-02-23 10:15:42 +01:00
mwerezak
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
mwerezak
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
mwerezak
c317fb8c39
Adds ability for uplink purchases to produce more than one item
2015-02-22 20:17:18 -05:00
Chinsky
79917d57b2
Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
...
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
Zuhayr
28e7411e2d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:06 +10:30
mwerezak
47cbfdd59e
Keeps zone selection and gun mode toggle HUD elements visible when scoped
2015-02-21 16:01:47 -05:00
mwerezak
11719a380e
Fixes #8151
2015-02-21 15:49:52 -05:00
Chinsky
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
451337476d
Merge with dev.
2015-02-21 20:11:35 +10:30
PsiOmega
89da19de8a
Fixes runtime in Topics() when called from non-NanoUI sources.
2015-02-21 10:32:20 +01:00
Zuhayr
0c206344b6
Master<dev
2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f
Master merge.
2015-02-21 19:51:28 +10:30
Zuhayr
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
PsiOmega
0b9406a089
Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
2015-02-21 10:17:17 +01:00
PsiOmega
4c8bf16628
Rudimentary uplink descriptions.
2015-02-21 10:16:47 +01:00
Chinsky
81599a9203
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
...
Adds robot synths
2015-02-21 11:43:39 +03:00
Chinsky
214324eaaf
Merge pull request #8156 from PsiOmegaDelta/CameraMove
...
Custom ninja spawn points.
2015-02-21 11:43:19 +03:00
Chinsky
6bd495fc47
Merge pull request #8164 from PsiOmegaDelta/NanoAir
...
Air Alarm and Atmospheric Controller NanoUI
2015-02-21 07:51:01 +03:00
MrSnapwalk
ee24bdb3b1
Adds the spider plushie - sprite by Bishop.
2015-02-20 21:17:46 -06:00
MrSnapwalk
cf431370f3
Action figure un-refactor, minor fix.
2015-02-20 21:02:26 -06:00
PsiOmega
18521e6983
Now possible to order a kit with a random toxin and syringe - 4TC
2015-02-20 21:13:34 +01:00
PsiOmega
5b299e0104
NanoUI atmosphere control and remote air alarm support.
2015-02-20 17:39:55 +01:00
Kelenius
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
MrSnapwalk
71f8a5c8e8
Minor fixes, action figure refactor.
2015-02-19 20:37:36 -06:00
Kelenius
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
PsiOmega
ead0f31426
Revises how Topic and NanoUI shares allowance-logic.
...
All mob-interaction logic now resides in nanointeraction.dm and is called by the base CanUseTopic().
Specifics for when objects allows mob-interaction can be specified by overriding CanUseTopic(), see machinery.dm.
2015-02-19 18:22:19 +01:00
Chinsky
ae0ce4e620
Merge pull request #8170 from mwerezak/inventoryfix
...
Fixes #8075 + cigar/pipe overlays
2015-02-19 19:59:16 +03:00
mwerezak
01784d8d6a
Fixes cigar/pipe mob overlays not updating when lit
2015-02-19 00:44:11 -05:00
MrSnapwalk
cc0266c776
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moretoys
...
Conflicts:
code/game/objects/random/random.dm
2015-02-18 19:02:23 -06:00
