xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons ...

Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi

2015-02-27 21:15:01 +00:00

..

SDQL2

…

adminhelp.dm

Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers

2015-02-27 16:17:20 +03:00

adminjump.dm

Update adminjump.dm

2015-02-17 13:44:21 +01:00

adminpm.dm

…

adminsay.dm

…

atmosdebug.dm

…

BrokenInhands.dm

optimizations to the way inhand files are found

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

buildmode.dm

Fixes buildmode throw function's help information. (left and right were switched)

2015-02-23 14:34:40 +01:00

cinematic.dm

…

deadsay.dm

…

debug.dm

Merge remote-tracking branch 'upstream/master' into traymesons

2015-02-27 21:15:01 +00: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

…

mapping.dm

SubSystem rewrite

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

massmodvar.dm

…

modifyvariables.dm

Warning check before sorting long lists in vv

2015-02-21 21:46:42 +11:00

one_click_antag.dm

ERT now spawn with random names because cheri hates fun

2015-02-09 20:10:29 +01:00

onlyone.dm

…

panicbunker.dm

Tweaks panic bunker verb logic a little bit

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

playsound.dm

SubSystem rewrite

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

possess.dm

…

pray.dm

Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP

2015-02-24 20:02:43 +11:00

randomverbs.dm

admins are thing

2015-02-13 17:00:51 +00:00

reestablish_db_connection.dm

…

tripAI.dm

SubSystem rewrite

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