Laharl Montogmmery 76495953db Moved up Bump() in silicon.dm, and tested it. ...

According to my tests, unachored AI and Borgs behave as normal when
bumped by a mob.

A human can swap places with a borg if both have help intent on when
moving...
But a borg can't swap places with a human if both have help intent on,
if it's the borg that's moving. Apparently it's a normal behavior,
tested it on Sibyl.

AI don't have intents so they just get pushed.

pAIs aren't affected by bump, as they seem to act like as objects when
walked over or thrown.
Decoys seems to be some old MALF module that isn't in use anymore, so I
didn't touch it.

Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm

2014-01-11 10:45:19 -05:00

..

admin

Fixes

2014-01-10 23:45:20 -05:00

assembly

Hiding mousetraps

2013-12-17 23:39:23 -05:00

awaymissions

Clown Planet corpses start skeletonized, exploit fixes

2014-01-01 21:38:19 -05:00

client

Small nanoui change

2014-01-07 18:24:38 -05:00

clothing

Major Ninja Patch

2014-01-09 20:39:29 -05:00

customitems

Bluesheild Locker Sprite and Dave's fluff item

2013-11-12 19:27:08 -05:00

destilery

Popable cans and beer cans

2013-12-31 21:44:21 -05:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

DetectiveWork

Brain Borer Overhaul

2013-12-19 03:32:19 -05:00

economy

Econ and hud fixes

2013-11-25 06:12:56 -05:00

events

Fix #371 (vermin trying to spawn in assembly line). plus other simple_animal issues.

2014-01-08 21:49:14 -05:00

ext_scripts

…

flufftext

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

food

Added spider meat recipes

2014-01-11 00:16:12 -05:00

genetics

…

icon generation

…

library

Magic Overhaul

2013-12-14 05:54:03 -05:00

liquid

…

maps

…

mining

Fix for mining.

2014-01-09 20:57:47 -05:00

mob

Moved up Bump() in silicon.dm, and tested it.

2014-01-11 10:45:19 -05:00

nano

Minor fix for NanoUI

2014-01-08 21:22:00 -05:00

organs

More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

2014-01-07 00:04:27 -05:00

paperwork

Talisman icon fix

2014-01-11 00:04:09 -05:00

power

Following /tg/'s lead, removes set background 1 for smoother gameplay.

2014-01-08 01:25:20 -05:00

projectiles

Doubled the shot capacity of the taser

2014-01-11 07:30:35 -05:00

reagents

Fix holywater hurting full power vampires

2014-01-11 04:41:32 -05:00

recycling

Xenoarch update

2013-10-29 11:56:04 -04:00

research

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-09 20:56:38 -05:00

scripting

…

security levels

Fixing up security level text

2014-01-08 02:52:35 -05:00

store

Added store computer & minor updates

2013-10-05 03:24:22 -04:00

surgery

Added and Adjusted Chemicals

2014-01-04 15:59:22 -05:00

virus2

Vampire commit 2

2013-12-14 05:19:54 -05:00