MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm

2014-03-08 22:03:03 -08:00

..

hud

Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371

2014-01-22 20:01:11 +00:00

adjacent.dm

Additional comments, move some code

2013-09-17 19:03:22 -04:00

ai.dm

AIs inside of intellicards will no longer be able to use their hotkeys while their wireless is disabled.

2014-01-15 19:26:59 -03:00

click.dm

Monkey trouble fix

2014-02-10 10:42:54 +04:00

cyborg.dm

Fixes borgs doing anything when dead

2014-01-16 07:02:07 +04:00

drag_drop.dm

removes a spawn() from the MouseDrop() proc

2014-02-21 08:59:32 -03:00

item_attack.dm

Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff.

2014-03-07 03:19:12 -08:00

observer.dm

Made the follow verb less buggy.

2014-01-05 17:44:46 +00:00

oldcode.dm

…

other_mobs.dm

Monkey attack messages now use span class

2014-02-12 16:43:31 -08:00

overmind.dm

Blob Features!

2013-10-06 22:56:22 +01:00

telekinesis.dm

Rename equip_to_slot_or_qdel() -> del()

2014-03-02 21:08:25 -08:00