PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge ...

Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm

2015-02-03 14:16:14 +01:00

..

adminhelp.dm

Removes categorization of Ahelps.

2015-01-31 21:13:05 -05:00

adminjump.dm

…

adminpm.dm

Removes categorization of Ahelps.

2015-01-31 21:13:05 -05:00

adminsay.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

atmosdebug.dm

Fixes #7040.

2014-11-17 12:27:29 +01:00

BrokenInhands.dm

…

buildmode.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

check_customitem_activity.dm

…

cinematic.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

custom_event.dm

…

deadsay.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

debug.dm

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

diagnostics.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

getlogs.dm

…

mapping.dm

Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names.

2014-11-03 12:51:01 +01:00

massmodvar.dm

…

modifyvariables.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

one_click_antag.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

onlyone.dm

…

playsound.dm

…

possess.dm

…

pray.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

randomverbs.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-12-23 00:01:09 +10:30

SDQL_2_parser.dm

…

SDQL_2.dm

…

SDQL.dm

…

striketeam_syndicate.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

striketeam.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

ticklag.dm

…

tripAI.dm

…

vox_raiders.dm

Manual icon file merge.

2014-10-11 06:40:36 +10:30