Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
Chinsky
08dd01801e
Merge pull request #5266 from mwerezak/firelock-fix
...
Proposes a fix for #5224
2014-06-17 14:58:33 +04:00
Chinsky
e304d0010d
Merge pull request #5273 from boopcat/happydrones
...
fixes!
2014-06-17 14:43:55 +04:00
Chinsky
dd4a937ca9
Merge pull request #5275 from GinjaNinja32/lighters
...
Fixes cheap lighters burning body parts other than the hands they're being held in
2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a
Merge pull request #5265 from mwerezak/wound-fixes
...
Fixes the wounding system
2014-06-17 14:41:22 +04:00
mwerezak
944394a042
Fixes armour being applied to projectiles twice
2014-06-17 01:20:49 -04:00
mwerezak
72377d160f
Fixes apply_damage ignoring species mods
...
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 00:54:20 -04:00
GinjaNinja32
fcdd0198c0
Fix lighter burning random body parts
2014-06-17 04:50:14 +01:00
mwerezak
274b03b083
Adds thrown object sharp and edge flags
2014-06-16 23:21:01 -04:00
unknown
e16658c37f
Adds diona unarmed attack type
2014-06-16 19:23:20 -04:00
unknown
95e05a894b
Fixes projectile sharp and edge flags being ignored
2014-06-16 19:17:20 -04:00
unknown
c5e09980b9
Fixes bleeding checks not respecting merged wounds
2014-06-16 18:49:20 -04:00
unknown
7b59cbec5c
Fixes large amounts of damage being carried by minor wound types
2014-06-16 18:42:17 -04:00
Boop
07a6ad4897
Fixes #5270
...
Changes simple_animal/Die() to use death from mob/living instead.
2014-06-16 23:30:37 +01:00
mwerezak
9f7e7004a3
Breach detection update
...
Now only triggers for abnormally low pressures.
Allows breach detection to trigger if an alarm was already raised in an
area for a different reason.
2014-06-16 13:47:04 -04:00
mwerezak
6dee9cf65d
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
mwerezak
45c2274b0a
Species claws are now sharp
2014-06-16 12:54:09 -04:00
mwerezak
8461e5b01f
Fixes bruises not having the right damage_type set
2014-06-16 12:15:31 -04:00
mwerezak
e829f8a633
Fixes wound merging
...
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
2014-06-16 12:15:11 -04:00
Loganbacca
32af387a25
Cargo train tweaks
...
- Reduce speed to slightly slower than running
- Only knock people over if emagged, otherwise just bump them back
- Temporarily disable latching trailers inline because no directional sprites (may or may not introduce bugs)
2014-06-16 20:54:18 +12:00
mwerezak
17aca7e84d
Fixes #5224
2014-06-16 01:43:56 -04:00
mwerezak
832fb31941
Fixes many small wounds protecting against...
...
...internal damage.
Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.
2014-06-16 01:04:30 -04:00
mwerezak
9f594e4755
Bullets are now properly sharp
2014-06-15 20:28:34 -04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
mwerezak
cbec032ae3
Fixes wrong wound types being used
...
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.
I imagine that relying on the order of the list returned by typesof() is
always a bad idea.
2014-06-15 19:08:29 -04:00
Walter0o
85a6d8a32d
fixes vox armalis being a choosable race
...
the IS_WHITELISTED flag will add the species to the whitelisted_species list,
which in turn gets used as the base list of choosable species in the char setup when
the server config has species whitelisting off.
unless you want giant combat spessbirds as crew ( as a security force maybe ? ;) ),
this is a bug.
2014-06-15 20:27:51 +02:00
mwerezak
6d07d99885
Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
...
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 11:57:57 -04:00
paprka
7a28f5eea0
overeye
2014-06-14 21:04:05 -07:00
Chinsky
df4a8cf706
Merge pull request #5253 from faerindel/squash_tests
...
Adds buildable and upgradeable PSUs (battery racks, not SMES).
2014-06-15 07:15:14 +04:00
mwerezak
4d12d263e9
Adds docking control to ERT shuttle
...
Also adjusts the location of the centcom shuttle docking controller.
2014-06-14 18:35:02 -04:00
mwerezak
40d9c4e26e
Adds centcom and admin shuttle docking controllers
2014-06-14 15:52:26 -04:00
mwerezak
6b9d887a2d
Adds engineering shuttle docking controllers
...
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.
2014-06-14 15:51:46 -04:00
mwerezak
d837e5d246
Streamlined docking code
...
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.
2014-06-14 15:51:26 -04:00
mwerezak
e30ffebe49
Adds mining shuttle docking controllers
2014-06-14 15:16:23 -04:00
mwerezak
dc7d8fafe0
Adjusts how undocking signals are used
...
Now both server and client will to undock concurrently. It looks much
more natural.
2014-06-14 15:16:05 -04:00
mwerezak
232e50e415
Shuttle console refactoring
...
Also adjusted the way undocking signals were used.
2014-06-14 15:15:48 -04:00
mwerezak
acec01fb14
Docking overrides now have a clear purpose
...
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.
2014-06-14 15:15:30 -04:00
Chinsky
09420d9fba
Merge pull request #5248 from Zuhayr/master
...
Robot fixes.
2014-06-14 23:05:46 +04:00
Zuhayr
c0138b8e81
Merge pull request #5251 from Loganbacca/train
...
Cargo train bugfixes
2014-06-15 03:49:17 +09:30
Zuhayr
cd4a8ff745
Amending a runtime in the mmi change.
2014-06-15 03:39:27 +09:30
Chinsky
1a3cd3786d
Merge pull request #5239 from Nerezza/dronelights
...
Built-in drone lighting
2014-06-14 19:10:14 +04:00
Chinsky
e935cc0947
Merge pull request #5250 from Kelenius/OfCultistsAndRunes
...
Rune drawing update
2014-06-14 19:04:35 +04:00
igalan
9a27556421
Let's test this rebase thing.
2014-06-14 15:20:25 +01:00
Zuhayr
194f1121c3
Amending a previous commit.
2014-06-14 20:31:35 +09:30
Loganbacca
70a4e5a240
Cargo train bugfixes
...
Also adds admin messaging when someone gets run over.
2014-06-14 22:51:06 +12:00
Kelenius
db882ba664
Rune drawing update
2014-06-14 13:57:23 +04:00
Zuhayr
5ad652e90c
Fixes #5195
2014-06-14 18:48:13 +09:30
Zuhayr
05a1bededb
Fixes #5236
2014-06-14 18:39:33 +09:30
Zuhayr
15d063c130
Fixes #4959
2014-06-14 18:33:06 +09:30
Zuhayr
98bddb9612
Fixes #5245
2014-06-14 18:06:47 +09:30
