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
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
mwerezak
11e5497368
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/projectiles/projectile/bullets.dm
2015-02-18 18:28:18 -05:00
mwerezak
583390937e
Improves bullet projectile embedding handling
...
Commit b1546ee3eb
2015-02-18 18:09:24 -05:00
Raptor1628
2ae273e1b8
Gear again
...
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.
http://baystation12.net/forums/viewtopic.php?f=5&t=12064
http://baystation12.net/forums/viewtopic.php?f=5&t=12031
http://baystation12.net/forums/viewtopic.php?f=5&t=12027
http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
