mwerezak
e46c3c8834
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
mwerezak
462593f0b5
Adds supply shuttle datum
2014-06-18 19:37:30 -04:00
Zuhayr
ce69599a3a
Whitelists diona nymphs. Forces them not to have universal_speak.
2014-06-19 08:48:58 +09:30
Zuhayr
8fa57539a5
Merge pull request #5295 from boopcat/happydrones
...
fixes
2014-06-19 08:23:13 +09:30
Hubblenaut
5e8a82bb0a
Fixes text color in advanced trauma kit surgery step
2014-06-18 23:11:01 +02:00
Chinsky
ceecd7abc9
Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
...
Adjusted color mixing helper to use inbuilt procs.
2014-06-18 23:45:25 +04:00
Chinsky
2396c6d882
Nextgen lighting #2 : Lights
...
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-18 20:38:33 +04:00
Chinsky
a54d9cfd3b
Nextgen lights #1 : supermatter
...
Now it glows with yellowish tint, getting brighter as damage level rise.
2014-06-18 19:52:19 +04:00
mwerezak
37b71c81fb
Armour can turn sharp attacks into blunt ones
...
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
2014-06-18 10:28:23 -04:00
mwerezak
5a3c7dc432
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-18 10:05:04 -04:00
mwerezak
2daab86c89
Fixes special shuttle consoles being...
...
...deconstructible
2014-06-18 09:37:30 -04:00
Boop
5b1949fb12
Fixes #5291 and another wound runtime
2014-06-18 12:44:08 +01:00
Boop
1b7acdb147
Fix runtime with brains and throwmode
2014-06-18 12:32:13 +01:00
mwerezak
0a394fb59f
Fixes tails not rendering on the player preview
2014-06-18 00:27:07 -04:00
Wouter
580547f924
Adds ..() on Chem Masters
...
This makes sure they use power, and don't work when the power is out, beside making sure functions work correctly. As they didn't on my (adapted) code.
2014-06-18 03:46:31 +02:00
Zuhayr
342bee81d4
Merge pull request #5284 from boopcat/happydrones
...
more fixes!
2014-06-18 08:58:00 +09:30
Boop
c7d745e9c1
fixed some weird slime runtime that's been around forever apparently
2014-06-17 23:30:25 +01:00
Boop
b784730ec0
Fixes #5285
...
will it never end ;~;
2014-06-17 22:41:25 +01:00
Boop
a903e400dd
Fixes #5088
...
also fixes more runtimes that mloc gave me
2014-06-17 20:35:48 +01:00
Jarcolr
fc4c918eda
Fixes #5255 and walking over edges
...
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-17 20:09:19 +03:00
Boop
3dfc20eebe
Fix a runtime for Mloc
...
(mloc is so lazy)
Also makes custom item spawning a tiny bit nicer!
file will only be loaded once, instead of every time someone spawns
2014-06-17 16:29:37 +01:00
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
e304d0010d
Merge pull request #5273 from boopcat/happydrones
...
fixes!
2014-06-17 14:43:55 +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
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
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
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
