Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics ...

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm

2015-06-23 12:54:26 -07:00

..

camera

Fixes cyborgs spawning as ghosts.

2014-04-13 13:04:36 +01:00

dead

Gang Update

2015-06-10 23:05:58 -06:00

living

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

2015-06-23 12:54:26 -07:00

new_player

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

interactive.dm

Removes unsimulated turfs.

2015-06-01 23:24:18 -03:00

inventory.dm

Fixed dropping items in mechs AND EVERYTHING ELSE

2015-05-16 02:04:42 +01:00

login.dm

Fixes deadmins from being unable to re-admin after disconnecting.

2015-01-05 00:50:49 -07:00

logout.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

mob_cleanup.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

mob_defines.dm

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

mob_grab.dm

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

2015-06-23 12:54:26 -07:00

mob_helpers.dm

Removes strip_html_properly(), replaces it with html_encode().

2015-06-11 15:37:41 +02:00

mob_movement.dm

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

mob_transformation_simple.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

mob.dm

Merge pull request #9882 from MrStonedOne/mctweaks

2015-06-13 04:37:00 +03:00

say_readme.dm

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

say.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

transform_procs.dm

Fixes #1190

2015-05-23 06:30:28 -03:00

update_icons.dm

Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed)

2015-03-26 15:23:52 +00:00