Chinsky
b5dda2b793
Merge pull request #8180 from mwerezak/mercenary
...
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
PsiOmegaDelta
bbbde676d5
Merge pull request #8200 from mwerezak/devfixes
...
Misc dev updates
2015-02-23 10:15:42 +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
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
3900b90abc
Merge pull request #8203 from Baystation12/master
...
Master into dev.
2015-02-22 18:24:47 +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
5bc076cc25
Adds a better placeholder item_state for the ion rifle
2015-02-21 14:25:06 -05:00
mwerezak
5be4a2f0e4
Merge remote-tracking branch 'upstream/dev' into mercenary
2015-02-21 13:22:51 -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
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
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
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
PsiOmega
f0a5dae1c4
Icarus cannon admin logs.
2015-02-20 19:54:15 +01:00
Kelenius
83fc1689ef
Fixes a turret runtime
2015-02-20 20:19:12 +03:00
PsiOmega
5b299e0104
NanoUI atmosphere control and remote air alarm support.
2015-02-20 17:39:55 +01:00
Zuhayr
31edc34a3d
Merge pull request #8184 from Kelenius/ofDronesAndVerbs
...
Axes drone verb category
2015-02-21 02:32:30 +10:30
Kelenius
4aee297d2e
Axes drone verb category
...
Moves verbs to "robot commands"
2015-02-20 17:21:12 +03:00
Neerti
3f16754e89
Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.
...
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
2015-02-20 08:04:17 -05:00
Kelenius
a0b73140e9
Fixes for synths and decompiler
2015-02-20 13:32:10 +03:00
Zuhayr
77805bfd05
Merge pull request #8179 from comma/undies
...
Fixes a sanity check turned insanity check forcing everyone to go commando
2015-02-20 17:01:25 +10:30
Kelenius
1c1e644f29
Adds robot synths
2015-02-19 21:04:27 +03:00
Chinsky
fde327a83c
Merge pull request #8121 from Neerti/2_13_2015_examine_tab
...
Adds the Examine Tab.
2015-02-19 21:00:22 +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
Chinsky
3c4bc1984c
Merge pull request #8159 from mwerezak/grab
...
Updates grabbing
2015-02-19 19:59:13 +03:00
mwerezak
1258517202
Fixes hiding mobs being layered underneath vents
2015-02-19 01:02:32 -05:00
mwerezak
82480ac1a7
Minor cleanup
2015-02-19 00:43:49 -05:00
mwerezak
6b6fcf81f2
Fixes #8075
2015-02-18 23:55:21 -05:00
mwerezak
2db45d592f
Makes the Z8 wearable on the back, adjusts some desc text.
2015-02-18 18:44:23 -05:00
