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

..

DB ban

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

permissionverbs

UID mass replace: src=\ref[src]

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

verbs

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

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

admin_investigate.dm

Fixes Investigation Logs and Runtimes

2016-06-24 12:30:49 -04:00

admin_memo.dm

Fixes a runtime when a null memo would be attempted to be

2016-08-31 00:27:09 -07:00

admin_ranks.dm

…

admin_verbs.dm

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

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

admin.dm

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

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

banappearance.dm

SQL sanitization fixes

2016-08-19 19:58:32 -04:00

banjob.dm

Moves from log_debug to log_runtime for non-fatal abberant states

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

buildmode.dm

Fix up buildmode log

2016-11-08 16:31:48 +01:00

create_mob.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

create_object.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

create_poll.dm

…

create_turf.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

holder2.dm

Removes dels and unused code that contains dels

2016-08-02 01:33:19 -04:00

IsBanned.dm

Mass replace

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

machine_upgrade.dm

…

NewBan.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

player_panel.dm

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

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

secrets.dm

UID mass replace: src=\ref[src]

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

sql_notes.dm

Mass replace

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

stickyban.dm

Mass replace

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

topic.dm

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

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

ToRban.dm

…

watchlist.dm

…