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

..

grenades

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

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

implants

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

melee

makes ninja less stupidly broken

2014-08-06 15:13:06 -07:00

storage

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

tanks

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

AI_modules.dm

Removes confusion because players cannot understand my genius.

2014-06-20 14:55:04 +02:00

airlock_painter.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

cards_ids.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

cigs_lighters.dm

Lighting cigarettes with flares/torches

2014-07-16 16:34:42 +02:00

clown_items.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

explosives.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

extinguisher.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

flamethrower.dm

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

2014-03-21 03:05:39 -07:00

gift_wrappaper.dm

Growns: The OOPening.

2014-07-03 16:43:07 -05:00

handcuffs.dm

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

2014-06-19 02:27:10 +04:00

kitchen.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

manuals.dm

Changed the default wiki to tgstation13.org/wiki.

2014-04-20 19:20:33 +01:00

mop.dm

var rename. Gia's right, this was kinda confusing

2014-04-23 15:11:59 -07:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Unidentinization

2014-05-13 02:18:21 +10:00

RCD.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

RSF.dm

…

scrolls.dm

…

shields.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

singularityhammer.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

stunbaton.dm

Warning message replaced by sparks sound

2014-06-02 01:42:50 +02:00

table_rack_parts.dm

One big update for stacks.

2014-06-10 20:36:08 +04:00

teleportation.dm

…

tools.dm

Makes welderbombs use fueltank's ex_act

2014-08-21 00:56:17 +10:00

twohanded.dm

Merge pull request #3677 from Kelenius/dualsaberfix

2014-05-14 09:27:37 +01:00

vending_items.dm

Initial pass to convert LF to CRLF

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

weaponry.dm

Unidentinization

2014-05-13 02:18:21 +10:00