Anewbe 82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits ...

# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm

2017-10-04 20:08:55 -05:00

..

callproc

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00

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

Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use.

2017-09-03 01:46:08 -07:00

verbs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits

2017-10-04 20:08:55 -05: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

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05: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 branch 'master' of https://github.com/PolarisSS13/Polaris into outfits

2017-10-04 20:08:55 -05:00

admin.dm

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

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

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05: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

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

topic.dm

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

ToRban.dm

…