Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme

2019-05-17 17:37:18 +02:00

..

SDQL2

…

adminhelp.dm

…

adminjump.dm

…

adminpm.dm

Fix style

2019-05-09 10:29:32 -07:00

adminsay.dm

…

alt_check.dm

…

antag-ooc.dm

…

atmosdebug.dm

…

BrokenInhands.dm

…

cinematic.dm

SSticker

2019-04-30 16:47:47 +01:00

custom_event.dm

…

deadsay.dm

…

debug.dm

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

2019-05-13 22:14:38 +02:00

diagnostics.dm

…

dice.dm

…

freeze.dm

…

getlogs.dm

…

gimmick_team.dm

SSticker

2019-04-30 16:47:47 +01:00

honksquad.dm

SSticker

2019-04-30 16:47:47 +01:00

infiltratorteam_syndicate.dm

Merge

2019-05-09 17:06:35 +01:00

map_template_loadverb.dm

…

mapping.dm

…

massmodvar.dm

…

modifyvariables.dm

…

one_click_antag.dm

Merge pull request #11438 from Emanthealmighty/AdminCultist-change

2019-05-17 19:15:39 +08:00

onlyone.dm

SSticker

2019-04-30 16:47:47 +01:00

onlyoneteam.dm

SSticker

2019-04-30 16:47:47 +01:00

playsound.dm

…

possess.dm

…

pray.dm

SSticker

2019-04-30 16:47:47 +01:00

randomverbs.dm

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

2019-05-13 22:14:38 +02:00

serialization.dm

…

space_transitions.dm

…

spawnfloorcluwne.dm

…

striketeam_syndicate.dm

SSticker

2019-04-30 16:47:47 +01:00

striketeam.dm

SSticker

2019-04-30 16:47:47 +01:00

ticklag.dm

…

toggledebugverbs.dm

…

tripAI.dm

SSticker

2019-04-30 16:47:47 +01:00

vox_raiders.dm

…