Ikarrus e811eac22e Resolve Conflicts: ...

icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-04-22 08:14:05 -06:00

..

DB ban

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07:00

permissionverbs

Removed database specifications since this is handled by connecting to a database context.

2014-09-21 05:26:58 -07:00

verbs

Merge pull request #9044 from Incoming5643/donks_will_be_put

2015-04-22 17:50:10 +10:00

admin_investigate.dm

Experimentor Invesigate Take 1

2015-02-20 15:09:59 -06:00

admin_memo.dm

fix

2014-09-26 22:48:23 -06:00

admin_ranks.dm

Changing/adding an admins rank now updates the player's table

2015-04-09 03:19:55 -07:00

admin_verbs.dm

Adds the "set round end sound" fun button so admins can override the generic sounds to play something else if want be.

2015-04-18 15:34:03 -04:00

admin.dm

Adds some sanity checks to admin ghost drag.

2015-04-15 02:58:54 -07:00

banappearance.dm

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07:00

banjob.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07:00

create_mob.dm

Removed commented out regenerate_icons()

2015-03-19 21:35:24 -07:00

create_object.dm

Added /obj/effect and /obj/item/weapon/gun path to Quick Create Object.

2015-04-12 18:26:24 +01:00

create_turf.dm

Optimized and refactored list2text, text2list, and replacetext.

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

holder2.dm

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

IsBanned.dm

Removes admin notices on failed logins in isbanned

2015-04-15 10:11:37 -07:00

NewBan.dm

changed note check to temp

2015-01-25 02:22:28 +11:00

newbanjob.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

player_notes.dm

View Own Notes Readabily Fix

2015-01-25 10:46:27 +01:00

player_panel.dm

Gang Mode Update 4

2015-04-21 23:23:15 -06:00

topic.dm

Merge pull request #8991 from Fayrik/AllTheSmallThings

2015-04-17 09:30:08 -05:00