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

# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme

2019-04-30 19:26:17 +02:00

..

DB ban

add ip/cid to db bans

2019-04-13 12:44:45 -07:00

permissionverbs

…

tickets

Admins can now see the mhelp tickets

2019-04-19 14:31:46 +02:00

verbs

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

2019-04-24 02:55:32 +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

Merge pull request #11328 from farie82/mhelp-rights-fix

2019-04-23 20:46:34 +08:00

admin.dm

Merge pull request #11393 from Fox-McCloud/powernet-refactor

2019-04-30 12:42:53 +08: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

Added checks now

2019-04-28 00:08:03 +02: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-21 23:27:23 +02:00

ToRban.dm

Completely Overhaul Logging

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

watchlist.dm

…