Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() ...

Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm

2014-08-31 13:40:16 +02:00

..

beast

u_equip is now called unEquip PANIC

2014-02-13 20:58:33 +01:00

computer2

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

disease2

second pass

2014-02-15 20:11:12 -08:00

gamemodes

Merge pull request #2824 from hornygranny/throw_range

2014-02-18 16:17:13 -08:00

hivebot

AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL

2014-08-24 20:35:49 +02:00

mining

…

optics

…

pda2

…

powerarmor

Added RPED, some sprites and new power cell path

2014-02-24 05:14:43 +04:00

spacecraft

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

_debug.dm

…

Agouri_stuff.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

airtunnel.dm

…

alien_embryo.dm

…

assemblies.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

asteroiddevice.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

authorize.dm

…

biomass_rift.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

blender.dm

…

brewing.dm

u_equip is now called unEquip PANIC

2014-02-13 20:58:33 +01:00

BrokenInhands.dm

…

cable_heavyduty.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

cable_logic.dm

…

carpetsplosion.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

conveyor.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

dna_mutations.dm

…

dna.dm

…

filter_control.dm

…

game_kit.dm

…

heater.dm

…

hologram.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

jobs.dm

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

limbs.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

musicplayer.dm

…

new_year.dm

Merge pull request #2824 from hornygranny/throw_range

2014-02-18 16:17:13 -08:00

newcombatsystem.dm

…

pain.dm

…

pipe_filter.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

pipe.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

scrap.dm

second pass

2014-02-15 20:11:12 -08:00

shuttle_engines.dm

…

siphs.dm

…

specops_shuttle.dm

…

specops.dm

Modification of .gitignore to include admins.txt. Hopefully.`

2013-10-30 17:56:00 -07:00

spells.dm

…

splash_simulation.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

tensioner.dm

…

traps.dm

…

travel.dm

…

Ultralight.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

vehicle.dm

…

Virus2Prob.dm

…