tigercat2000 0a289875ce Merge remote-tracking branch 'upstream/master' into NTSL2 ...

# Conflicts:
#	code/game/machinery/telecomms/traffic_control.dm
#	code/modules/admin/verbs/randomverbs.dm
#	code/modules/scripting/Implementations/Telecomms.dm

2018-11-05 15:16:07 -08:00

..

DB ban

global lists global defined

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

permissionverbs

…

tickets

adds stat entry, removes unused proc

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

verbs

Merge remote-tracking branch 'upstream/master' into NTSL2

2018-11-05 15:16:07 -08:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

global lists global defined

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

admin_verbs.dm

Merge remote-tracking branch 'upstream/master' into NTSL2

2018-11-05 15:16:07 -08:00

admin.dm

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

…

create_object.dm

…

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

…

NewBan.dm

…

player_panel.dm

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

secrets.dm

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

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

sql_notes.dm

global lists global defined

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

stickyban.dm

…

topic.dm

This should work

2018-11-04 11:15:57 -05:00

ToRban.dm

…

watchlist.dm

…