Ren Erthilo af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm

2012-04-02 00:37:54 +01:00

..

dead/observer

Merge cleanup.

2012-03-28 01:12:34 +01:00

living

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

new_player

Fixes for viewing skills mid-round. Changed title capitalisation.

2012-03-29 01:57:31 +01:00

organ

Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives.

2012-03-31 22:01:21 -07:00

simple_animal

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

login.dm

A large amount of groundwork for /tg/ code. Comes with some gameplay changes.

2012-03-26 03:16:01 +01:00

logout.dm

…

mob_cleanup.dm

TG: Moved a proc from mob_defines to mob_cleanup going to be implementing

2012-03-26 23:39:53 +01:00

mob_defines.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

mob_grab.dm

Attack logging (finally)

2012-03-08 15:16:54 +10:30

mob_helpers.dm

Final commit of the examine/damage overhaul.

2012-03-29 20:44:10 -07:00

mob_movement.dm

Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives.

2012-03-31 22:01:21 -07:00

mob.dm

Merging SkyMarshal's stuff.

2012-03-30 16:26:04 +01:00

say.dm

TG: brainloss is now only referenced via procs. r2874

2012-03-26 23:20:45 +01:00

screen.dm

Adds message for people breaking out of cuffs.

2012-03-28 09:57:49 +01:00

transform_procs.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-03-30 06:18:37 +01:00