ikarrus d3ec4dbf72 Resolving Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

2014-06-27 09:30:43 -06:00

..

DB ban

Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.

2013-07-16 07:26:51 +02:00

permissionverbs

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

verbs

Resolving Conflicts:

2014-06-27 09:30:43 -06:00

admin_investigate.dm

Added admin logging for the gravity generator.

2014-03-25 10:12:33 +00:00

admin_memo.dm

Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.

2012-11-02 10:23:04 +00:00

admin_ranks.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization

2014-04-08 14:29:58 +02:00

admin_verbs.dm

Admins lacking +admin get admin pm stuff

2014-05-08 13:17:23 -07:00

admin.dm

removes gravity failure event placeholder

2014-06-12 14:52:53 -07:00

banappearance.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

banjob.dm

- Moved access definitions for jobs to the job datum. In addition, I added an extra access definition: minimal_access and access. Minimal access is intended for servers with large populations. All jobs have the bare minimum access they need to survive. access, on the other hand, is a far more generous list of accesses, intended for servers with lower populations, where players are expected to do more than just the job they were assigned. Also for servers which don't want to allow people to hide in their own ultra secure departments, where no one can get to them.

2013-01-06 16:38:45 +00:00

create_mob.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-07 22:15:25 -05:00

create_object.dm

Fixes issue #2489

2014-05-01 06:01:14 -03:00

create_turf.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-07 22:15:25 -05:00

holder2.dm

fixes shit

2014-03-09 18:31:43 +01:00

IsBanned.dm

Fixes incompabilities of ban DB with Linux system

2014-01-22 23:58:57 +01:00

NewBan.dm

I found #1870 in more places.

2013-12-01 23:18:59 +01:00

newbanjob.dm

Fixed a mistake in newbanjob.dm

2013-12-01 23:26:59 +01:00

player_notes.dm

Removes the "Remove All Notes" options from Player Notes. Ckeys are cleared from the list automatically when the last of their notes are erased.

2013-08-22 16:07:10 -05:00

player_panel.dm

[Admin] Added logging for changeling hivemind chat

2014-04-17 21:23:11 -06:00

topic.dm

removes gravity failure event placeholder

2014-06-12 14:52:53 -07:00