Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 ...

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

2018-02-07 19:30:50 -05:00

..

callproc

…

DB ban

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

permissionverbs

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

secrets

Polaris sync

2017-09-15 21:17:34 -04:00

verbs

Merge pull request #4715 from VOREStation/arosorta-maploader

2018-02-04 22:30:03 -06:00

view_variables

Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines

2017-09-26 19:09:12 -05:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

admin_report.dm

…

admin_secrets.dm

Cleans up some Event Manager code

2017-11-03 16:24:36 -05:00

admin_verbs.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

admin.dm

Remove several admin verbs from context menu

2018-02-04 12:32:55 -05:00

banjob.dm

…

ckey_vr.dm

…

create_mob.dm

…

create_object.dm

Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu.

2017-03-27 01:58:49 -07:00

create_turf.dm

…

holder2.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

IsBanned.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

map_capture.dm

…

NewBan.dm

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06:00

newbanjob.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

news.dm

Improves Lobby News

2017-01-26 00:37:38 -05:00

player_notes.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

player_panel.dm

Cleans up some Event Manager code

2017-11-03 16:24:36 -05:00

topic.dm

Improve admin idlekick capability/awareness

2018-02-04 01:05:03 -05:00

ToRban.dm

…