Loganbacca
d6022017c8
New vehicle loading code
...
- Vehicles now load items on them somewhat like roller beds, allowing you to interact with them
2014-06-21 14:13:25 +12:00
Mloc-Argent
dd7f0dac0e
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/card.dm
code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01: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
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
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
Zuhayr
342bee81d4
Merge pull request #5284 from boopcat/happydrones
...
more fixes!
2014-06-18 08:58:00 +09:30
Boop
a903e400dd
Fixes #5088
...
also fixes more runtimes that mloc gave me
2014-06-17 20:35:48 +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
Boop
07a6ad4897
Fixes #5270
...
Changes simple_animal/Die() to use death from mob/living instead.
2014-06-16 23:30:37 +01:00
mwerezak
45c2274b0a
Species claws are now sharp
2014-06-16 12:54:09 -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
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
paprka
7a28f5eea0
overeye
2014-06-14 21:04:05 -07:00
Chinsky
09420d9fba
Merge pull request #5248 from Zuhayr/master
...
Robot fixes.
2014-06-14 23:05:46 +04:00
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
Zuhayr
194f1121c3
Amending a previous commit.
2014-06-14 20:31:35 +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
Zuhayr
cd5818fd29
Fixes #5243
2014-06-14 18:06:31 +09:30
Zuhayr
cf1fe85e62
Fixes #5246
2014-06-14 18:04:19 +09:30
Zuhayr
80db3a284b
Merge pull request #5216 from Loganbacca/trainmerge
...
Cargo Trains
2014-06-14 17:13:55 +09:30
Ccomp5950
5c115525cf
Bugfix: Humans will no longer send the same message twice when talking on binary.
...
Also: Removed the beep boop boop from showing up if you are the src of the communication.
2014-06-13 20:47:02 -05:00
Nerezza
52a76c0b0b
Make drone light into verb
...
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.
2014-06-13 14:39:49 -05:00
Mloc-Argent
9896e44d8a
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Ravensdale
1fe53510ed
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge
2014-06-12 05:04:28 -07:00
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
Ccomp5950
3aa766c689
Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change
2014-06-10 19:49:42 -05:00
Ccomp5950
77c733b17c
Mentor permissions fixes and such.
...
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)
Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
2014-06-10 19:48:41 -05:00
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
mwerezak
9c6cd39b9c
Fixes compile error
2014-06-05 23:05:35 -04:00
Hubblenaut
a80f2b12e6
Movement with wheelchair not possible in space
2014-06-05 22:51:37 -04:00
Hubblenaut
1e09995f63
Wheelchairs spawn on footless characters
2014-06-05 22:50:42 -04:00
Hubblenaut
3c1d0a83bf
Fixes. Wheelchair is supposed to help the occupant and not the driver, damn it.
2014-06-05 22:50:24 -04:00
Hubblenaut
1e450d301d
Adds Wheelchairs with basic driving functionality
2014-06-05 22:49:20 -04:00
Zuhayr
4233f2eb8c
Update drone.dm
...
Typo fix and message trim fix.
2014-06-06 10:13:40 +09:30
Hubblenaut
d5aacc8e79
Fixes setting internals on belt- and suit storage slots being ignored
2014-06-05 00:41:54 +02:00
Zuhayr
a00d4295a4
Fixed small drone talk and Bump() issues.
2014-06-04 16:26:12 +09:30
