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 |
|
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 |
|
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 |
|
PsiOmegaDelta
|
3e2133fd9e
|
Merge pull request #8196 from comma/master
Fixes ship deceleration for south/east directions
|
2015-02-22 16:48:31 +01:00 |
|
Zuhayr
|
54c3456c59
|
Merge pull request #8198 from mwerezak/apcfix
Fixes APC emp_act()
|
2015-02-22 19:22:19 +10:30 |
|
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 |
|
Chinsky
|
9e1a2315cd
|
Changes loop for space tiles from world one to for over coordinates. It would raise infinite loop warnings otherwise when used with big zlevels.
|
2015-02-22 11:13:09 +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 |
|
Zuhayr
|
ac233b9db7
|
Fixes an issue with bees using bluespace powers to modify plants globally.
|
2015-02-22 16:18:33 +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
|
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 |
|
mwerezak
|
657028026a
|
Fixes APC emp_act()
Now properly handles the channel changes.
|
2015-02-21 14:55:13 -05:00 |
|
mwerezak
|
5bc076cc25
|
Adds a better placeholder item_state for the ion rifle
|
2015-02-21 14:25:06 -05:00 |
|
Chinsky
|
18607897f0
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2015-02-21 21:47:16 +03:00 |
|
mwerezak
|
5be4a2f0e4
|
Merge remote-tracking branch 'upstream/dev' into mercenary
|
2015-02-21 13:22:51 -05:00 |
|
mwerezak
|
31e8babb9f
|
Fixes rig emp severity class handling
|
2015-02-21 13:15:23 -05:00 |
|
mwerezak
|
39363749ca
|
Fixes suit breach_threshold not being applied.
|
2015-02-21 13:15:02 -05:00 |
|
Zuhayr
|
e0267c4adf
|
Merge pull request #8194 from comma/gore
Surgery overlays
|
2015-02-22 01:00:47 +10:30 |
|
Chinsky
|
acfd99e33c
|
Surgery now shows up on mob, in all gory glory.
|
2015-02-21 16:31:44 +03:00 |
|
emmanuelbassil
|
a46540ecd7
|
Damn you space
|
2015-02-21 14:53:33 +02:00 |
|
Zuhayr
|
3c71472644
|
Removing unused and now uncompilable distillery code.
|
2015-02-21 22:37:53 +10:30 |
|
Zuhayr
|
14f8e3beac
|
Numerous kitchen changes in tandem with prior commit. Removed processor.
|
2015-02-21 22:24:01 +10:30 |
|
Zuhayr
|
9ad9f19a0b
|
Transitioning back to using flour as a reagent. Sorry RKF.
|
2015-02-21 22:04:32 +10:30 |
|
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
|
0b2ca42600
|
Tweaks.
|
2015-02-21 20:56:55 +10:30 |
|
emmanuelbassil
|
feb335c172
|
Goddamnit.
|
2015-02-21 11:56:01 +02:00 |
|
emmanuelbassil
|
0621e6adea
|
Adding ..()
|
2015-02-21 11:39:36 +02:00 |
|
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 |
|
Chinsky
|
81599a9203
|
Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
|
2015-02-21 11:43:39 +03:00 |
|
emmanuelbassil
|
ec8b3fe195
|
Forgot the else!
|
2015-02-21 10:14:33 +02:00 |
|
emmanuelbassil
|
88dd80088c
|
Using switch statement
|
2015-02-21 08:43:43 +02:00 |
|
Chinsky
|
2b2332cfc1
|
Merge pull request #8157 from mwerezak/gun-rewrite
Better handling of mob projectile passthrough and embedding + some gun tweaks
|
2015-02-21 07:52:58 +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 |
|
Chinsky
|
2361cf91f0
|
Merge pull request #8186 from PsiOmegaDelta/IcarusLogs
Icarus cannon admin logs.
|
2015-02-21 07:50:14 +03:00 |
|
mwerezak
|
09afd35798
|
Syringe gun cartridges change name when loaded
|
2015-02-20 21:04:19 -05:00 |
|
mwerezak
|
598ab2a207
|
Adds a mostly module-less merc rig type
|
2015-02-20 19:21:32 -05:00 |
|
emmanuelbassil
|
db702e13b6
|
Fixes #8174
|
2015-02-20 23:33:22 +02:00 |
|