Atlantiscze
488c25ae73
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-24 13:09:05 +01:00
Chinsky
e6abfc01f6
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-02-24 10:54:17 +03:00
Chinsky
9f5deb2697
Merge pull request #8038 from Zuhayr/xenohydro
...
Hydroponics rewrite, kitchen changes.
2015-02-24 10:34:08 +03:00
Zuhayr
8fc4b31238
Updated changelog.
2015-02-24 18:02:03 +10:30
Zuhayr
391ddd970e
Resolves remaining issues with xenohydro PR.
2015-02-24 17:55:39 +10:30
Chinsky
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
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
Chinsky
b73d541c65
Merge pull request #8155 from PsiOmegaDelta/subsystems
...
Centralized Alarm Handling
2015-02-24 04:39:48 +03:00
Chinsky
11a55faeaf
Merge pull request #8127 from PsiOmegaDelta/SuppliesOfTheGodfather
...
New traitor items - Part II
2015-02-24 04:38:33 +03: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
Atlantiscze
286623f6f7
Another attempt at resolving merge conflict.
2015-02-23 08:12:49 +01:00
Atlantiscze
228651be1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-23 08:03:57 +01:00
mwerezak
4a762d7459
Adjusts bullet penetration to account for reduced damage
2015-02-22 23:28:06 -05:00
Zuhayr
a0917f442e
Merge pull request #7934 from mwerezak/runtime
...
Allows the CMO to become friends with Runtime
2015-02-23 13:50:57 +10:30
mwerezak
dfec1fcb5c
Improves energy gun charge icon handling, adds ion rifle in-hand sprite.
2015-02-22 21:46:18 -05:00
mwerezak
575c41a6b0
Fixes the map again
...
Somehow a single line path change became 582 additions and deletions.
2015-02-22 21:23:28 -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
00dfef8d02
Merge pull request #8144 from PsiOmegaDelta/int
...
Restores baystation12.int.
2015-02-22 11:33:19 +03:00
Chinsky
3aeb07f572
Merge pull request #8154 from mwerezak/mapping
...
Holodeck
2015-02-22 11:33:01 +03: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
7f58c19f20
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-22 18:37:21 +10:30
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
Zuhayr
640322bffc
Merge pull request #8199 from mwerezak/compile-warning
...
Fixes compile warning, cleanup
2015-02-22 14:06:01 +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
mwerezak
5d627d4b24
Fixes compile warning, cleanup
2015-02-21 15:36:33 -05:00
