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

# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme

2019-04-10 21:54:54 +02:00

..

DB ban

Revert "Discord Bot Functionality"

2019-01-30 21:19:33 -05:00

permissionverbs

…

tickets

made the my ticket verbs available for the normal players

2019-03-09 23:31:32 +01:00

verbs

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

2019-04-10 21:54:54 +02:00

admin_investigate.dm

Add admin logs to NTSL2, change font to Verdana

2018-11-06 09:57:33 -08:00

admin_memo.dm

…

admin_ranks.dm

global lists global defined

2018-10-02 15:52:46 -05:00

admin_verbs.dm

made the my ticket verbs available for the normal players

2019-03-09 23:31:32 +01:00

admin.dm

Merge branch 'master' into mhelp-ticket-system

2019-04-07 14:43:49 +02:00

banappearance.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

banjob.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

create_mob.dm

…

create_object.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

create_poll.dm

…

create_turf.dm

…

holder2.dm

global lists global defined

2018-10-02 15:52:46 -05:00

IsBanned.dm

Fixes runtime in IsBanned.dm

2018-10-14 04:34:00 +02:00

machine_upgrade.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

NewBan.dm

…

player_panel.dm

Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit

2019-04-07 20:30:48 +08:00

secrets.dm

adminbus

2019-03-30 05:15:47 -04:00

sql_notes.dm

global lists global defined

2018-10-02 15:52:46 -05:00

stickyban.dm

…

topic.dm

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

2019-04-10 21:54:54 +02:00

ToRban.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

watchlist.dm

…