Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/verbs/AI_status.dm
	code/modules/mob/living/silicon/ai/ai.dm
	config/custom_items.txt
	icons/mob/AI.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/machinery/status_display.dm

@@ -305,6 +305,8 @@
 					set_picture("ai_facepalm")
 				if("Friend Computer")
 					set_picture("ai_friend")
+				if("Tribunal")
+					set_picture("tribunal")
 
 			return
 

code/game/verbs/AI_status.dm

@@ -0,0 +1,22 @@
+/mob/living/silicon/ai/proc/ai_statuschange()
+	set category = "AI Commands"
+	set name = "AI status"
+
+	if(usr.stat == 2)
+		usr <<"You cannot change your emotional status because you are dead!"
+		return
+	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
+	if(src.ckey == "serithi")
+		ai_emotions.Add("Tribunal","Tribunal Malfunctioning")
+	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
+	for (var/obj/machinery/ai_status_display/AISD in world) //change status
+		spawn( 0 )
+		AISD.emotion = emote
+	for (var/obj/machinery/status_display/SD in world) //if Friend Computer, change ALL displays
+		if(emote=="Friend Computer")
+			spawn(0)
+			SD.friendc = 1
+		else
+			spawn(0)
+			SD.friendc = 0
+	return

code/modules/customitems/item_defines.dm

@@ -252,6 +252,13 @@
 	icon = 'custom_items.dmi'
 	icon_state = "odysseus_spec_id"
 
+/obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
+	name = "McReary's journal"
+	desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
+	icon = 'custom_items.dmi'
+	icon_state = "mcreary_journal"
+	item_state = "mcreary_journal"
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -326,7 +333,6 @@
 	desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
 	icon = 'custom_items.dmi'
 	icon_state = "enos_adlai_1"
-	flags = FPRINT|TABLEPASS
 
 //////////// Suits ////////////
 
@@ -398,8 +404,17 @@
 	item_state = "tian_dress"
 	color = "tian_dress"
 
+/obj/item/clothing/under/rank/bartender/fluff/classy	//searif: Ara Al-Jazari
+	name = "classy bartender uniform"
+	desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket."
+	icon = 'custom_items.dmi'
+	icon_state = "ara_bar_uniform"
+	item_state = "ara_bar_uniform"
+	color = "ara_bar_uniform"
+
 //////////// Masks ////////////
 
+/*
 /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell
 	name = "\improper First Nations facemask"
 	desc = "A simple cloth rag that bears the flag of the first nations."
@@ -409,6 +424,7 @@
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
+*/
 
 /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick
 	name = "shamrock pendant"

config/admins.txt

@@ -1,7 +1,9 @@
+abi79 - Game Master
 arcalane - Game Admin
 bobbehluvspropane - Game Admin
-cacophony - Retired Admin
+cacophony - Game Admin
 cajoes - Game Admin
+cib - Retired Admin
 compactninja - Retired Admin
 duntadaman - Game Admin
 dysthymia - Retired Admin

config/alienwhitelist.txt

@@ -18,21 +18,25 @@ forsamori - Tajaran
 forsamori - Soghun
 galenus - Soghun
 galenus - Skrell
+kersh - Skrell
+jadepython - Skrell
 masterofstuff - Skrell
 mangled - Skrell
+mcgulliver - Skrell
 nerezza - Skrell
 philphil123 - Soghun
 quilan - Tajaran
 searif - Soghun
 searif - Tajaran
 searif - Skrell
+serithi - Skrell
 sniperyeti - Skrell
-succubusy - Skrell
-teddybehr - Soghun
-whitellama - Skrell
 spaceman96 - Tajaran
 spaceman96 - Soghun
 spaceman96 - Skrell
 sparklysheep - Skrell
-watermelonstorm - Tajaran
+succubusy - Skrell
+teddybehr - Soghun
 whitellama - Skrell
+watermelonstorm - Tajaran
+whitellama - Skrell

config/config.txt

@@ -55,8 +55,8 @@ SQL_ENABLED 0
 ## default probablity is 1, increase to make that mode more likely to be picked
 ## set to 0 to disable that mode
 ## Cult mode is in alpha test, enable at your own risk
-PROBABILITY EXTENDED 0
-PROBABILITY TRAITOR 1
+PROBABILITY EXTENDED 1
+PROBABILITY TRAITOR 2
 PROBABILITY METEOR 0
 PROBABILITY MALFUNCTION 0
 PROBABILITY BLOB 0
@@ -64,7 +64,7 @@ PROBABILITY NUCLEAR 0
 PROBABILITY SANDBOX 0
 PROBABILITY WIZARD 0
 PROBABILITY RESTRUCTURING 0
-PROBABILITY REVOLUTION 1
+PROBABILITY REVOLUTION 0
 PROBABILITY CHANGELING 0
 PROBABILITY CULT 2
 PROBABILITY MONKEY 0

config/custom_items.txt

@@ -1,17 +1,20 @@
 atomicdog92: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack
 botanistpower: Walter Brooks: /obj/item/clothing/gloves/fluff/walter_brooks_1
+bountylord13: Norah Briggs: /obj/item/clothing/head/helmet/welding/fluff/norah_briggs_1
 chinsky: Victor Kaminski: /obj/item/fluff/victor_kaminsky_1
 chinsky: Summer Springfield: /obj/item/weapon/camera_test/fluff/orange
 compactninja: Al Peterson: /obj/item/clothing/head/flatcap
 compactninja: Lister Black: /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle, /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle
+cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig
 desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform
 desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform
-deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap
+deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap, /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
 fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetime
 fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
 fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
+jamini: Edwin Atweeke: /obj/item/clothing/suit/storage/labcoat/fluff/burnt
 leonheart11:  Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
 lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
 lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
@@ -23,28 +26,24 @@ nerezza: Asher Spock: /obj/item/weapon/reagent_containers/hypospray/fluff/asher_
 nerezza: Asher Spock: /obj/item/weapon/card/id/fluff/asher_spock_2
 orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen
 orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
+phaux: Tian Yinhu: /obj/item/clothing/under/fluff/tian_dress
 rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1
 roaper: Enos Adlai: /obj/item/clothing/head/fluff/enos_adlai_1
 searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/helmet/welding/fluff/yuki_matsuda_1
-searif: Tsiokeriio Tarbell: /obj/item/clothing/mask/fluff/flagmask
+searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy
 serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /obj/item/clothing/shoes/fluff/leatherboots
+sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal
 sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1
 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
+sniperyeti: Patrick Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1
+sniperyeti: Susan Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1
 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/storage/labcoat/fluff/pink
 sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
 staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
 thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
-themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
+themij: Taryn Keppel: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
 whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
-jamini: Edwin Atweeke: /obj/item/clothing/suit/storage/labcoat/fluff/burnt
-cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig
-sniperyeti: Patrick Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1
-sniperyeti: Susan Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1
-bountylord13: Norah Briggs: /obj/item/clothing/head/helmet/welding/fluff/norah_briggs_1
-deusdactyl: James Girard: /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield
-phaux: Tian Yinhu: /obj/item/clothing/under/fluff/tian_dress
-caelaislinn: Johnathan Dawkins: /obj/item/clothing/head/helmet/welding/fluff/norah_briggs_1
+whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1

config/moderators.txt

@@ -1,15 +1,20 @@
 ; just add the ckey (lowercase) of every moderator on a separate line
 ; lines starting with ; are comments and will be ignored
+asanadas
+botanistpower
+bowlsoldier
 chinsky
 cubejackal
 dakonic
-themij
-sparklysheep
-botanistpower
-asanadas
-deusdactyl
 densane
-bowlsoldier
+deusdactyl
 fenrisian
 madmalicemccrea
-roaper
+mangled
+phaux
+roaper
+searif
+sparklysheep
+themij
+; Why u no keep list in alphabetical order?! Lazies! Lazies! -Abi
+; Imma best alphabetiser - Erthilo