Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

callproc

Replace ';' with '; // do nothing' for clarity

2015-09-10 04:00:37 +01:00

DB ban

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-26 08:48:37 +02:00

permissionverbs

…

secrets

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

verbs

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

view_variables

Removed xenomorphs.

2016-02-20 11:50:18 +10:30

admin_attack_log.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

admin_report.dm

…

admin_secrets.dm

Organize and Beautify Admin Secrets Panel

2016-05-27 16:32:46 -04:00

admin_verbs.dm

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

admin.dm

Organize and Beautify Admin Secrets Panel

2016-05-27 16:32:46 -04:00

banjob.dm

…

ckey_vr.dm

Added Change CKey Admin Verb

2016-05-20 20:43:36 -04:00

create_mob.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

create_object.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

create_turf.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

holder2.dm

…

IsBanned.dm

…

map_capture.dm

Added more help/error messages to the tool.

2015-10-08 12:36:09 +03:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

Add proc/crash_with, fix two incorrect qdel calls

2015-09-23 13:29:54 +01:00

player_panel.dm

Round start timer now remains at 0 until the round actually starts.

2016-04-20 15:27:59 +01:00

topic.dm

Organize and Beautify Admin Secrets Panel

2016-05-27 16:32:46 -04:00

ToRban.dm

…