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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

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

..

SDQL2

Fixes selecting datums through SDQL2

2016-09-26 04:54:34 -04:00

adminhelp.dm

Add OOC throttling

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

adminjump.dm

Admin Log Tweaks

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

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

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

atmosdebug.dm

Fixes Check Piping verb

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

BrokenInhands.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

cinematic.dm

Cinematic Fix and Relative Pathing

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

custom_event.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

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

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

freeze.dm

Merge pull request #5858 from Markolie/grammarnazi

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

getlogs.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

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

Initialization deferral is now handled by the caller, but

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

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

Removes Event Procs

2016-11-16 07:14:08 -05:00

onlyone.dm

special_role/objective refactor

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

onlyoneteam.dm

Mass replace

2016-07-07 19:34:02 -07:00

playsound.dm

Fixes negated conditions

2016-08-01 14:25:38 -07:00

possess.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

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

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

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

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -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

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

vox_raiders.dm

special_role/objective refactor

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