PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm

2014-11-11 14:13:02 +01:00

..

adminhelp.dm

Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).

2014-07-07 21:37:28 -05:00

adminjump.dm

-You can now sell plasma sheets for supply points. Conversion rate is 3 plasma sheets for 1 point. The rate is adjustable.

2012-12-23 01:01:25 +00:00

adminpm.dm

Fixes #5088

2014-06-17 20:35:48 +01:00

adminsay.dm

Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).

2014-07-07 21:37:28 -05:00

atmosdebug.dm

Pipe rendering rewrite

2014-07-18 13:39:39 +00:00

BrokenInhands.dm

Fixed up BrokenInHands a little.

2013-05-16 13:05:23 +01:00

check_customitem_activity.dm

resolved a MySQL statement issue

2013-05-03 13:21:44 +10:00

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

Adds Mentors.

2014-05-04 23:12:06 -05:00

debug.dm

Ports more of /tg/'s powernet code.

2014-10-29 14:01:35 +01:00

diagnostics.dm

Z-Level Compatibility

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

getlogs.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

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

Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.

2012-11-02 10:23:04 +00:00

modifyvariables.dm

fix for contaminants not processing if air is OK otherwise

2014-09-03 19:00:00 +01:00

one_click_antag.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

onlyone.dm

Replaces antag intro text and objective announcement with a proc.

2014-07-30 21:36:31 +09:30

playsound.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

possess.dm

…

pray.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

randomverbs.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

SDQL_2_parser.dm

SDQL and SQDL 2 from Lunacode.

2013-11-04 16:16:53 +00:00

SDQL_2.dm

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

SDQL.dm

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

striketeam_syndicate.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

striketeam.dm

Cleans up radio frequency numbers.

2014-09-18 13:07:34 +02:00

ticklag.dm

Reverts r5012

2012-11-07 23:00:38 +00:00

tripAI.dm

Moved triple-AI to the secrets panel (fun)

2012-11-12 16:38:40 +00:00

vox_raiders.dm

Manual icon file merge.

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