Chinsky
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
Chinsky
46a3b6579c
Merge pull request #9030 from Yoshax/changelog
...
Adds changelog entry for previous emergency message changes
2015-04-30 10:31:15 +03:00
PsiOmegaDelta
6343afb7fd
Merge pull request #9038 from PsiOmegaDelta/dev
...
Dev
2015-04-30 08:17:55 +02:00
PsiOmega
c01f115c57
Updates changelog.
2015-04-30 08:10:59 +02:00
PsiOmega
f72fe0d194
Merge remote-tracking branch 'upstream/master' into dev
2015-04-30 08:09:25 +02:00
PsiOmegaDelta
c639b68a10
Merge pull request #9026 from Yoshax/cringemore
...
Adds Sabess' custom item
2015-04-29 21:20:53 +02:00
PsiOmegaDelta
a4830cab53
Merge pull request #9022 from Yoshax/alloftheitems
...
Adds more custom loadout items
2015-04-29 21:20:50 +02:00
Yoshax
2c5d981e57
Adds changelog entry for previous changes
2015-04-29 18:56:36 +01:00
Yoshax
233b9a5d11
Adds Sabess' custom item
2015-04-29 16:47:20 +01:00
Yoshax
2c4783386f
Removes CE's hardhat
2015-04-29 16:11:53 +01:00
PsiOmegaDelta
8f9e46378d
Merge pull request #9025 from PsiOmegaDelta/Changelog
...
Changelog
2015-04-29 14:42:58 +02:00
PsiOmega
ac73a23bf2
Corrects AGPL link text (target link was correct however).
2015-04-29 14:41:57 +02:00
PsiOmega
493552d68e
Updating the changelog.
2015-04-29 14:36:24 +02:00
Chinsky
5538c03021
Merge pull request #9024 from Kelenius/ofChemAndThree
...
Chemistry-Holder.dm: absolute paths
2015-04-29 14:00:23 +03:00
Kelenius
bd6a8e4d54
Chemistry-Holder.dm: absolute paths
2015-04-29 13:53:04 +03:00
Chinsky
34bbe33030
Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
...
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
Yoshax
e5cd8c7adb
Fixes jacket
2015-04-28 20:40:16 +01:00
Yoshax
6c8bc809c6
Adds more items to custom loadout
2015-04-28 20:37:57 +01:00
PsiOmegaDelta
851d5423f3
Merge pull request #8971 from mwerezak/burst-fire
...
Gun firemode system, burst firing
2015-04-28 20:24:03 +02:00
Zuhayr
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
Zuhayr
2091302305
Merge pull request #9019 from mwerezak/dev-fixes
...
Fixes backpack overlay
2015-04-29 02:38:03 +09:30
mwerezak
19aff88b90
Fixes #9017
2015-04-28 12:22:21 -04:00
Zuhayr
74db1f71b5
Merge pull request #9018 from Kelenius/ofChemAndTwo
...
Chemistry recipes: absolute pathing
2015-04-29 00:15:20 +09:30
Kelenius
185aadb5a9
Chemistry recipes: absolute pathing
2015-04-28 16:55:13 +03:00
Chinsky
04b994f939
Merge pull request #9008 from PsiOmegaDelta/CameraPoff
...
Adds the APC & camera damage events.
2015-04-28 13:49:50 +03:00
PsiOmegaDelta
2a22e8ca12
Merge pull request #9016 from PsiOmegaDelta/dev
...
Dev
2015-04-28 09:14:37 +02:00
PsiOmega
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
74675f5a14
Updates changelog.
2015-04-28 08:48:48 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624
Merge pull request #9015 from Kelenius/ofChemAndOne
...
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
mwerezak
39b185660e
Updates changelog
2015-04-28 02:18:02 -04:00
mwerezak
9d9de73f03
Firemode bugfixes
2015-04-28 02:09:39 -04:00
mwerezak
472b284f24
Adds hitscan to the heavy sniper projectile
2015-04-28 02:08:12 -04:00
mwerezak
e93e9c1434
Expands firemodes to include energy gun settings
...
Expands on firemodes to include settings for the egun/adv egun,
floraray, and pulse rifle.
By default attack_self() now cycles firemodes for any gun. Updates
several projectile guns in a desperate attempt to avoid the need for an
unload ammo verb.
2015-04-28 02:06:54 -04:00
PsiOmegaDelta
bb7cd10cbb
Merge pull request #8984 from volas/master
...
Fixes #8913
2015-04-28 07:53:45 +02:00
Chinsky
fd9bdf8059
Merge pull request #9012 from Yoshax/openpls
...
Fixes HoS' office door
2015-04-28 08:45:52 +03:00
PsiOmegaDelta
1e457f6e34
Merge pull request #9009 from Yoshax/icanintosurgery
...
Fixes antag surgery kit
2015-04-28 07:35:58 +02:00
Chinsky
0e1a8051f8
Merge pull request #8996 from PsiOmegaDelta/SecureBuzzing
...
Now only secure airlocks buzz if access is restricted.
2015-04-28 06:26:49 +03:00
Chinsky
6fb3446af3
Merge pull request #9000 from RavingManiac/master
...
Candle tweak
2015-04-28 06:26:44 +03:00
Chinsky
0ff3d9af99
Merge pull request #9005 from mwerezak/master-fixes
...
Fixes (master)
2015-04-28 06:26:32 +03:00
Chinsky
afa82e5d83
Merge pull request #9003 from mwerezak/dev-fixes
...
Fixes
2015-04-28 06:26:22 +03:00
Chinsky
c2b6bf602b
Merge pull request #9004 from Kelenius/ofSeedsAndStorages
...
Fixes #8998
2015-04-28 06:26:05 +03:00
Chinsky
33149cb218
Merge pull request #8989 from PsiOmegaDelta/PsycEval
...
Mental Health Office changes.
2015-04-28 06:25:47 +03:00
Chinsky
1328414485
Merge pull request #8960 from mwerezak/item-color
...
Fixes #8577 , cleans up item_color, clothing/under and backpacks
2015-04-28 06:25:35 +03:00
Chinsky
bf7dc5be9d
Merge pull request #8994 from PsiOmegaDelta/AirlockPressure
...
Airlocks can now crush more things.
2015-04-28 06:25:23 +03:00
volas
59e17f7a9b
small fix
2015-04-28 00:41:14 +03:00
Yoshax
531bbcfb7c
Fixes HoS' office door
2015-04-27 22:40:02 +01:00
mwerezak
36d9944dfd
Fixes #8977
2015-04-27 14:55:18 -04:00
