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

Conflicts:
	code/modules/mob/transform_procs.dm

2015-04-27 00:11:49 +02:00

..

devices

Merge pull request #9159 from Ikarrus/gang5

2015-04-26 14:29:50 -05:00

robot

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

stacks

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

weapons

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

2015-04-27 00:11:49 +02:00

apc_frame.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

blueprints.dm

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

body_egg.dm

- Makes body_egg parent for alien embryos/changeling eggs

2015-03-24 17:54:20 +01:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.dm

…

crayons.dm

Squashed commits. You can see what they do in the first commit/PR desc

2015-04-25 14:05:30 -06:00

dehy_carp.dm

Fixed code, carp won't attack owner, corrected spelling.

2015-04-11 03:48:08 +01:00

documents.dm

…

holotape.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

latexballoon.dm

…

shooting_range.dm

more spans

2015-04-24 20:52:00 +03:00

toys.dm

Squashed commits. You can see what they do in the first commit/PR desc

2015-04-25 14:05:30 -06:00

trash.dm

…