Mars d9b60a7bfb Fix merge conflict

2018-10-09 09:41:37 +02:00

..

DB ban

…

permissionverbs

Closes a rank modification hole

2017-07-19 22:26:19 -07:00

tickets

adds stat entry, removes unused proc

2018-08-28 19:30:20 +01:00

verbs

Fix merge conflict

2018-10-09 09:41:37 +02:00

admin_investigate.dm

Rust-G integration. Makes logging procs 2-3 times less expensive (EVEN WITH CALL OVERHEAD). tgstation/tgstation#36858

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

admin_memo.dm

…

admin_ranks.dm

Completely Overhaul Logging

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

admin_verbs.dm

Merge pull request #9459 from variableundefined/NPCPoolPort

2018-10-07 21:01:30 -07:00

admin.dm

Fix merge conflict

2018-10-09 09:41:37 +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

Add vv_can_delete, kill last vestiges of 'forbidden objects'

2017-09-15 17:27:33 -07:00

IsBanned.dm

fixes annoying typo on permanent ban

2018-05-22 12:00:56 +01:00

machine_upgrade.dm

Removes All Weapons

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

NewBan.dm

…

player_panel.dm

Fix merge conflict

2018-10-09 09:41:37 +02:00

secrets.dm

Merge remote-tracking branch 'upstream/master' into weather-subsystem

2018-06-13 16:56:19 -04:00

sql_notes.dm

Makes notes table always use ckeys

2017-02-28 00:49:54 -05:00

stickyban.dm

…

topic.dm

Fix merge conflict

2018-10-09 09:41:37 +02:00

ToRban.dm

Completely Overhaul Logging

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

watchlist.dm

…