Markolie f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi

2017-01-06 16:36:46 +01:00

..

SDQL2

Fixes SDQL2's client manipulation

2017-01-02 22:19:52 -05:00

adminhelp.dm

Add OOC throttling

2016-11-08 17:01:44 +01:00

adminjump.dm

…

adminpm.dm

Add OOC throttling

2016-11-08 17:01:44 +01: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

…

BrokenInhands.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

Verb category changes, telecoms verb fix

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

debug.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2016-12-23 19:32:19 +01:00

diagnostics.dm

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

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

dice.dm

…

freeze.dm

Merge pull request #5858 from Markolie/grammarnazi

2016-12-07 12:33:36 -05:00

getlogs.dm

…

honksquad.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

infiltratorteam_syndicate.dm

Runtime & bug fixes

2016-12-03 06:24:47 -08:00

map_template_loadverb.dm

…

mapping.dm

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

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

massmodvar.dm

Lay groundwork for megafauna, and add Ashdragon.

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

modifyvariables.dm

Lay groundwork for megafauna, and add Ashdragon.

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

one_click_antag.dm

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub

2016-11-22 01:48:56 -05:00

onlyone.dm

…

onlyoneteam.dm

…

playsound.dm

…

possess.dm

…

pray.dm

Add OOC throttling

2016-11-08 17:01:44 +01:00

randomverbs.dm

Verb category changes, telecoms verb fix

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

serialization.dm

…

space_transitions.dm

…

striketeam_syndicate.dm

Creates Syndicate Team Radio Frequency

2016-09-05 03:35:29 -07:00

striketeam.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

ticklag.dm

…

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

…

vox_raiders.dm

…