SamCroswell 8477d382a7 Merge conflict Fix ...

Conflicts:
	icons/mob/suit.dmi

2015-03-08 20:38:07 -04:00

..

adminhelp.dm

Downgrade list of potential ahelp subjects to 2: Complaint or Question

2015-02-17 09:21:22 -05:00

adminjump.dm

…

adminpm.dm

Downgrade list of potential ahelp subjects to 2: Complaint or Question

2015-02-17 09:21:22 -05:00

adminsay.dm

Fix mentors seeing MSAY

2015-02-26 21:41:59 -05:00

atmosdebug.dm

Major atmos overhaul: scrubbers and pipes can now co-exist

2015-01-18 02:24:24 +01:00

BrokenInhands.dm

…

check_customitem_activity.dm

…

cinematic.dm

Switched verbs around, removed Fun tab, new Event tab for event coordinators

2014-06-21 04:37:50 -04:00

custom_event.dm

Moar Event stuff

2014-06-21 07:12:55 -04:00

deadsay.dm

Bug fixes, bot proces controller update

2015-02-24 01:40:43 +01:00

debug.dm

NT Rep + Blueshield Uniform Change

2015-03-08 16:59:01 -04:00

diagnostics.dm

Running tests and cleaning out useless debug verbs/procs.

2014-07-13 05:32:40 -04:00

freeze.dm

Extra Freeze features- Prevent direct touching and pulling

2015-02-20 05:16:03 +01:00

getlogs.dm

…

honksquad.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

mapping.dm

Remove legacy viewpoint code, move back to Bay's and /tg/'s system

2015-02-10 17:02:27 +01:00

massmodvar.dm

…

modifyvariables.dm

…

one_click_antag.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

onlyone.dm

Sound Updates

2015-02-16 16:29:43 -05:00

onlyoneteam.dm

Sound Updates

2015-02-16 16:29:43 -05:00

playsound.dm

Switched verbs around, removed Fun tab, new Event tab for event coordinators

2014-06-21 04:37:50 -04:00

possess.dm

Object verb removal crew

2014-07-15 08:47:43 -04:00

pray.dm

Merge pull request #367 from Markolie/master

2015-02-20 16:22:32 -05:00

randomverbs.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

striketeam_syndicate.dm

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

striketeam.dm

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

ticklag.dm

…

tripAI.dm

Switched verbs around, removed Fun tab, new Event tab for event coordinators

2014-06-21 04:37:50 -04:00

vox_raiders.dm

Insulated Gloves Fix

2015-03-08 19:12:35 -04:00