Jordie0608 3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration ...

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi

2015-07-01 19:41:00 +10:00

..

SDQL2

…

adminhelp.dm

Removes duplicate variable in adminhelp.

2015-06-27 16:49:39 -07:00

adminjump.dm

Fixes adminjump being dumb.

2015-03-07 19:00:48 +01:00

adminpm.dm

Admin help tweaks.

2015-06-26 16:30:37 -07:00

adminsay.dm

Cleans up adminhelp keyword searcher and changelog for #10196.

2015-06-27 13:03:47 -07:00

atmosdebug.dm

…

bluespacearty.dm

Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life().

2015-05-23 22:34:04 +02:00

BrokenInhands.dm

optimizations to the way inhand files are found

2015-01-18 21:14:47 -08:00

buildmode.dm

Adds area generators to build mode

2015-06-03 21:57:11 +02:00

cinematic.dm

…

deadsay.dm

Moves chat toggles into their own variable.

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

debug.dm

Some varedit improvements

2015-06-27 18:00:57 +03:00

diagnostics.dm

Update diagnostics.dm

2015-02-13 17:30:52 +00:00

fps.dm

SubSystem rewrite

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

getlogs.dm

…

machine_upgrade.dm

forgot the new admin debug verb

2015-06-06 18:50:14 -07:00

mapping.dm

SubSystem rewrite

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

massmodvar.dm

Small works with VV:

2014-11-05 17:34:33 -03:00

modifyvariables.dm

Stability fix

2015-05-29 19:42:41 +02:00

one_click_antag.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

onlyone.dm

purge the unused

2014-11-13 21:10:53 -08:00

panicbunker.dm

Tweaks panic bunker verb logic a little bit

2015-02-26 16:02:26 -08:00

playsound.dm

Fixes a pretty significant bug where sounds set with set round end sound would only actually play for the person who set the sound

2015-04-28 23:15:27 -04:00

possess.dm

The singularity/narsie are no longer machines

2014-12-12 19:42:37 -03:00

pray.dm

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

2015-06-16 17:24:20 +10:00

randomverbs.dm

breaks nuke's topic into procs so it works better with toggle_nuke

2015-06-23 21:49:13 +10:00

reestablish_db_connection.dm

Makes re-establish db connection verb logic better

2014-10-24 12:34:07 -07:00

tripAI.dm

SubSystem rewrite

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