Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

2017-08-05 19:03:52 -04:00

..

DB ban

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

permissionverbs

Closes a rank modification hole

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

verbs

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

2017-08-05 19:03:52 -04:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Fix admin control_freak setting

2017-06-05 18:21:08 -07:00

admin.dm

Merge pull request #7543 from Kyep/gamma_pod

2017-06-27 15:28:41 -04:00

banappearance.dm

…

banjob.dm

Removes All Comments about auto-correction and Finddeclaration.exe

2017-07-22 02:54:45 -04:00

buildmode.dm

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

create_mob.dm

…

create_object.dm

…

create_poll.dm

Remove the commented out code

2017-02-25 18:56:58 -05:00

create_turf.dm

…

holder2.dm

Goonchat Admin Filters

2017-02-06 12:19:33 -08:00

IsBanned.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

machine_upgrade.dm

…

NewBan.dm

Replace all BYOND text macros

2017-02-21 15:41:37 +01:00

player_panel.dm

Fixes TS category in CS showing with only mindless spiders

2017-03-19 22:18:50 -07:00

secrets.dm

Adds jani/paranormal ERT and more

2017-06-26 01:55:15 -07:00

sql_notes.dm

Makes notes table always use ckeys

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

stickyban.dm

…

topic.dm

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

2017-08-05 19:03:52 -04:00

ToRban.dm

…

watchlist.dm

…