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

..

Processes

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

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

ProcessScheduler

Moves from log_debug to log_runtime for non-fatal abberant states

2016-08-23 17:03:52 -07:00

communications.dm

Changes syndi team radio display text

2016-09-06 21:50:36 -07:00

configuration.dm

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

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

failsafe.dm

Mass replace

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

hooks-defs.dm

Fixes morgue updating and removes VGhooks

2016-07-11 17:39:21 -04:00

hooks.dm

Mutiny Mode

2014-05-15 01:01:54 -04:00

master_controller.dm

Clicky stat buttons

2016-08-15 09:44:07 -07:00

verbs.dm

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

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

voting.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00