Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

2017-08-05 19:03:52 -04:00

..

SDQL2

Closes up stuff in SDQL2

2017-07-19 23:00:55 -07:00

adminhelp.dm

Removes duplicate (PP) from ahelps/mhelps

2017-03-18 23:36:43 -07:00

adminjump.dm

Admin Log Tweaks

2016-07-15 22:00:16 -04:00

adminpm.dm

Fix admin PM logs including emoji_enabled span

2017-05-25 06:57:06 -07:00

adminsay.dm

Verb category changes, telecoms verb fix

2016-11-08 16:23:13 +01:00

alt_check.dm

…

antag-ooc.dm

…

atmosdebug.dm

Fixes Check Piping verb

2016-07-12 00:10:31 -04:00

BrokenInhands.dm

…

cinematic.dm

Cinematic Fix and Relative Pathing

2016-07-10 15:20:13 -04:00

custom_event.dm

Fix compile issue

2017-02-09 01:00:23 +01:00

deadsay.dm

Verb category changes, telecoms verb fix

2016-11-08 16:23:13 +01:00

debug.dm

Merge branch 'master' into findnreplace

2017-03-05 12:09:52 +00:00

diagnostics.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

dice.dm

…

freeze.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

getlogs.dm

…

gimmick_team.dm

Gimmick Team improvements

2017-06-28 02:17:04 -07:00

honksquad.dm

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

2017-08-05 19:03:52 -04:00

infiltratorteam_syndicate.dm

remove that button!

2017-07-19 12:20:36 -04:00

map_template_loadverb.dm

Initialization deferral is now handled by the caller, but

2016-07-07 00:17:21 -07:00

mapping.dm

Ports over tg's map conflict helping script

2017-01-18 20:27:00 -08:00

massmodvar.dm

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

modifyvariables.dm

Closes up stuff in SDQL2

2017-07-19 23:00:55 -07:00

one_click_antag.dm

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

2017-08-05 19:03:52 -04:00

onlyone.dm

Adds Highlander Style: The Martial Art of Highlanders

2017-06-07 02:35:23 -04:00

onlyoneteam.dm

Ported /tg/'s outfit datums, refactored job controller to support them

2017-02-17 11:35:45 -08:00

playsound.dm

Sound Update/Refactor

2017-07-25 20:35:38 -04:00

possess.dm

…

pray.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

randomverbs.dm

remove that button!

2017-07-19 12:20:36 -04:00

serialization.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

space_transitions.dm

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

striketeam_syndicate.dm

remove that button!

2017-07-19 12:20:36 -04:00

striketeam.dm

remove that button!

2017-07-19 12:20:36 -04:00

ticklag.dm

-tg- Move Refactor

2017-05-25 06:35:01 -07:00

toggledebugverbs.dm

Adds a "VV by ref" proc to let people VV by a ref string

2016-08-26 16:29:46 -07:00

tripAI.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

vox_raiders.dm

special_role/objective refactor

2016-08-01 21:29:19 -07:00