comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

2013-08-04 01:40:32 +04:00

..

dead

…

living

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2013-08-04 01:40:32 +04:00

new_player

Fix for #3392.

2013-07-30 12:15:12 +03:00

death.dm

…

emote.dm

…

inventory.dm

…

login.dm

…

logout.dm

Updated the linkage between the NanoTrasen IRC bot and the server.

2013-07-02 23:41:40 +01:00

mob_cleanup.dm

…

mob_defines.dm

Revert "Adds in the Kida"

2013-07-12 12:22:35 +01:00

mob_grab.dm

…

mob_helpers.dm

…

mob_movement.dm

Adjusted kitchen knives. Added projectile pinning. Various tweaks.

2013-06-13 20:46:09 -07:00

mob_transformation_simple.dm

…

mob.dm

Merge branch 'BEF-staging'

2013-07-08 23:28:22 +01:00

say.dm

Properly reverts Kida. (what a mess)

2013-07-12 12:48:07 +01:00

screen.dm

Clicking on storage boxes now properly puts stuff in storage.

2013-06-05 19:43:01 +04:00

transform_procs.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-06-25 23:55:01 -07:00

update_icons.dm

…