Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm

2019-09-21 12:40:07 -04:00

..

DB ban

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

permissionverbs

…

tickets

Admin verb mega update

2019-09-09 01:26:50 -04:00

verbs

Removes custom admin event info verbs (#12355)

2019-09-20 18:14:06 -07: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

…

admin_verbs.dm

Removes custom admin event info verbs (#12355)

2019-09-20 18:14:06 -07:00

admin.dm

Admin verb mega update

2019-09-09 01:26:50 -04:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

holder2.dm

…

ipintel.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

IsBanned.dm

this stupid space who even made appealmessage have a space in it

2019-07-11 19:03:01 -04:00

machine_upgrade.dm

…

NewBan.dm

…

outfits.dm

More outfit fixes

2019-06-09 23:27:06 +02:00

player_panel.dm

Revert "taking player_panel out to the woodshed"

2019-09-09 08:46:43 -04:00

secrets.dm

adminbus

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

sql_notes.dm

Sanitize all inputs

2019-07-14 09:35:12 -07:00

stickyban.dm

re-add sticky ban, player_panel, increase width of ssd/afk window a bit

2019-09-09 10:12:58 -04:00

topic.dm

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-17 11:24:58 -04:00

ToRban.dm

…

watchlist.dm

Sanitize all inputs

2019-07-14 09:35:12 -07:00