Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage ...

# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm

2019-09-28 00:16:11 -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

Revert "Revert "Datumizes traitors and mindslaves"" (#12378)

2019-09-25 19:47:16 -07:00

admin_investigate.dm

…

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

Maintainers Have No Sense of Right or Wrong (#12381)

2019-09-24 15:15:05 -07: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-28 00:16:11 -04:00

ToRban.dm

…

watchlist.dm

Sanitize all inputs

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