mwerezak
ae6466ac45
Examining the Z8 now shows what is loaded in the grenade launcher.
2015-02-25 00:14:02 -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
mwerezak
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
mwerezak
401709cd23
Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite
2015-02-24 20:15:18 -05:00
mwerezak
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
mwerezak
404c8886da
Fixes #8230
2015-02-24 19:37:49 -05:00
Zuhayr
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
Zuhayr
a1afc3a48a
Merge pull request #8235 from PsiOmegaDelta/HoldIt
...
Fixes #8234
2015-02-25 05:45:54 +10:30
PsiOmega
b3b7ed06cd
Fixes #8234
...
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
Neerti
2c8c4a2327
Fixes some misc examine bugs.
2015-02-24 07:42:06 -05:00
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
391ddd970e
Resolves remaining issues with xenohydro PR.
2015-02-24 17:55:39 +10:30
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
mwerezak
4f86f69808
Fixes missing return that made all bullets pass through mobs
2015-02-23 22:28:37 -05:00
Chinsky
b73d541c65
Merge pull request #8155 from PsiOmegaDelta/subsystems
...
Centralized Alarm Handling
2015-02-24 04:39:48 +03:00
mwerezak
3940c35184
Misc gun tweaks
2015-02-23 18:25:22 -05:00
mwerezak
e540550cff
Adds an underslung grenade launcher to the Z8.
2015-02-23 17:56:54 -05:00
PsiOmega
d8245540ef
Restores silicon alarm notices.
2015-02-23 21:29:00 +01:00
PsiOmega
c55f807b42
Removes random Telecrystal grants, instead increases the start amount by 2.
2015-02-23 20:56:48 +01:00
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
PsiOmega
4659415af2
Atmospheric computer NanoUI interface.
2015-02-23 17:14:20 +01:00
Zuhayr
d66f4457a1
Merge pull request #8211 from PsiOmegaDelta/Starlight
...
Ports /tg/'s starlight luminance.
2015-02-24 02:19:50 +10:30
PsiOmega
f510c38d22
Alarm centralization completion
...
Atmosphere alarms now handled centrally.
2015-02-23 15:11:13 +01:00
PsiOmega
a2cd104cc9
Alarm centralization completion
...
Fire alarms now handled centrally.
2015-02-23 13:28:19 +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
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
PsiOmega
1c763ff2c9
Merge remote-tracking branch 'upstream/dev' into subsystems
2015-02-23 10:32:32 +01:00
PsiOmega
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
PsiOmegaDelta
bbbde676d5
Merge pull request #8200 from mwerezak/devfixes
...
Misc dev updates
2015-02-23 10:15:42 +01:00
PsiOmega
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
mwerezak
4a762d7459
Adjusts bullet penetration to account for reduced damage
2015-02-22 23:28:06 -05:00
mwerezak
dfec1fcb5c
Improves energy gun charge icon handling, adds ion rifle in-hand sprite.
2015-02-22 21:46:18 -05:00
mwerezak
3ae3ef7961
Merge remote-tracking branch 'upstream/dev' into runtime
2015-02-22 21:13:20 -05: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
PsiOmegaDelta
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
Chinsky
79917d57b2
Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions
...
Rudimentary uplink descriptions.
2015-02-22 11:32:49 +03:00
Chinsky
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
Zuhayr
6c121e8e33
Fixes bugs with vines and potency.
2015-02-22 18:36:06 +10:30
Zuhayr
3900b90abc
Merge pull request #8203 from Baystation12/master
...
Master into dev.
2015-02-22 18:24:47 +10:30
Zuhayr
23b93e7540
Added tray lighting verb.
2015-02-22 17:34:41 +10:30
Zuhayr
d0ca48cd25
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:16 +10:30
Zuhayr
28e7411e2d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 16:28:06 +10:30
mwerezak
2fcf8d51f4
Allows exosuits to interface with adjacent airlock controllers and buttons.
2015-02-21 20:54:01 -05:00
mwerezak
f7c65b4358
Makes IB no longer contribute to overall damage
2015-02-21 16:56:25 -05:00
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
