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

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

optics

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

pda2

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

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

Changes Limbs into Obj's

2013-10-11 19:11:55 +01:00

Agouri_stuff.dm

Initial pass to convert LF to CRLF

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

airtunnel.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

alien_embryo.dm

Moved the define for /obj/effect/forcefield out of unused and back into the code in /objects/effects/forcefields.dm. I've also moved the mime's forcefield subtype in there. Fixes issue 1259.

2013-01-24 00:02:08 +00:00

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

Finished moving the clothes in defines over to modules.

2012-06-23 19:25:01 +00:00

biomass_rift.dm

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

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

blender.dm

Fixed me being retarded.

2012-08-22 19:55:52 +00:00

brewing.dm

u_equip is now called unEquip PANIC

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

BrokenInhands.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

cable_heavyduty.dm

Initial pass to convert LF to CRLF

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

cable_logic.dm

- Undid my edits to the master controller regarding fast atmos.. I've tested it on the live server in several rounds and think we could spare to call atmos processing twice as often, meaning air movement would spread twice as fast. Calling it 4x as often was too much tho, resulting in noticeable lag, especially when the station was destroyed.

2013-01-28 02:32:04 +00:00

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

Resolves #283

2013-04-24 09:37:30 +01:00

dna.dm

Committing Faerdan's UI overhaul. Includes a UI browser class to easily manage and standardize user interfaces. This first release does not convert all the user interfaces in the game but only most of them. You can find samples of these user interfaces here: http://imgur.com/a/5dr6E

2013-02-27 20:02:42 +00:00

filter_control.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

game_kit.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

heater.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

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

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

new_year.dm

Merge pull request #2824 from hornygranny/throw_range

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

newcombatsystem.dm

Now all calls for bruteloss are handled via procs now. Extensibility++

2011-12-24 20:54:25 +00:00

pain.dm

Changes Limbs into Obj's

2013-10-11 19:11:55 +01:00

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

Moved shuttle_engines.dm to the unused folder as it has apparently been unticked for ages.

2012-11-19 01:00:32 +00:00

siphs.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

specops_shuttle.dm

Smallified Centcomm and removed a large amount of the unused machines. This affects most stuff on z2.

2013-03-09 04:35:37 +00:00

specops.dm

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

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

spells.dm

Moved the define for /obj/effect/forcefield out of unused and back into the code in /objects/effects/forcefields.dm. I've also moved the mime's forcefield subtype in there. Fixes issue 1259.

2013-01-24 00:02:08 +00:00

splash_simulation.dm

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

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

tensioner.dm

Resolves #283

2013-04-24 09:37:30 +01:00

traps.dm

Changes Limbs into Obj's

2013-10-11 19:11:55 +01:00

travel.dm

Engineering got a new machine that spawns/feeds the singularity.

2011-02-09 06:07:32 +00:00

Ultralight.dm

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

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

vehicle.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

Virus2Prob.dm

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

2011-12-30 16:43:41 +00:00