Merge pull request #1888 from comma/master

Configs and logging

code/game/machinery/computer/communications.dm

@@ -540,6 +540,8 @@
 		if("message")
 			status_signal.data["msg1"] = data1
 			status_signal.data["msg2"] = data2
+			log_admin("STATUS: [src.fingerprintslast] set status screen message with [src]: [data1] [data2]")
+			message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
 		if("alert")
 			status_signal.data["picture_state"] = data1
 

code/game/objects/items/devices/PDA/cart.dm

@@ -231,6 +231,14 @@
 			if("message")
 				status_signal.data["msg1"] = data1
 				status_signal.data["msg2"] = data2
+				if(loc)
+					var/obj/item/PDA = loc
+					var/mob/user = PDA.fingerprintslast
+					if(istype(PDA.loc,/mob/living))
+						name = PDA.loc
+					log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
+					message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
+
 			if("alert")
 				status_signal.data["picture_state"] = data1
 

code/modules/customitems/item_defines.dm

@@ -364,13 +364,13 @@
 
 //////////// Suits ////////////
 
-/obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
+/obj/item/clothing/suit/labcoat/fluff/pink //spaceman96: Trenna Seber
 	name = "pink labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
 	icon = 'custom_items.dmi'
 	icon_state = "labcoat_pink_open"
 
-/obj/item/clothing/suit/storage/det_suit/fluff/graycoat //vinceluk: Seth Sealis
+/obj/item/clothing/suit/det_suit/fluff/graycoat //vinceluk: Seth Sealis
 	name = "gray coat"
 	desc = "Old, worn out coat. It's seen better days."
 	icon = 'custom_items.dmi'
@@ -378,7 +378,7 @@
 	item_state = "graycoat"
 	color = "graycoat"
 
-/obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
+/obj/item/clothing/suit/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
 	name = "leather jacket"
 	desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum."
 	icon = 'custom_items.dmi'
@@ -386,7 +386,7 @@
 	item_state = "leatherjack"
 	color = "leatherjack"
 
-/obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke
+/obj/item/clothing/suit/labcoat/fluff/burnt //Jamini: Edwin Atweeke
 	name = "burnt labcoat"
 	desc = "This lab coat has clearly seen better, less burnt, days."
 	icon = 'custom_items.dmi'
@@ -483,7 +483,7 @@
 	icon_state = "cdc_jumpsuit"
 	color = "cdc_jumpsuit"
 
-/obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
+/obj/item/clothing/suit/labcoat/fluff/cdc_labcoat
 	name = "\improper CDC labcoat"
 	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."
 	icon = 'custom_items.dmi'
@@ -498,7 +498,7 @@
 	icon_state = "medical_short"
 	color = "medical_short"
 
-/obj/item/clothing/suit/storage/labcoat/fluff/red
+/obj/item/clothing/suit/labcoat/fluff/red
 	name = "red labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
 	icon = 'custom_items.dmi'
@@ -506,7 +506,7 @@
 
 ////// Retired Patrol Outfit //desiderium: Rook Maudlin
 
-/obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat
+/obj/item/clothing/suit/det_suit/fluff/retpolcoat
 	name = "retired colony patrolman's coat"
 	desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font."
 	icon = 'custom_items.dmi'

code/world.dm

@@ -18,8 +18,8 @@
 
 	src.load_mode()
 	src.load_motd()
-	src.load_admins()
 	src.load_mods()
+	src.load_admins()
 	investigate_reset()
 	if (config.usewhitelist)
 		load_whitelist()

config/admins.txt

@@ -25,3 +25,4 @@ strumpetplaya - Retired Admin
 tastyfish - Retired Admin
 uristqwerty - Game Master
 wrongnumber - Game Admin
+mij - Game Admin

config/custom_items.txt

@@ -1,13 +1,13 @@
-atomicdog92: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack
+atomicdog92: Seth Sealis: /obj/item/clothing/suit/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
+bountylord13: Norah Briggs: /obj/item/clothing/head/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
+desiderium: Rook Maudlin: /obj/item/clothing/suit/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, /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
 executivekill: Hunter Duke: /obj/item/weapon/lighter/zippo/fluff/executivekill_1
@@ -15,11 +15,11 @@ 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
+jamini: Edwin Atweeke: /obj/item/clothing/suit/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
-madmalicemccrea: Alice McCrea: /obj/item/clothing/head/helmet/welding/fluff/alice_mccrea_1
+madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccrea_1
 mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1
 misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
 morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
@@ -30,7 +30,7 @@ orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
 phaux: Tian Krieger: /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: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/welding/fluff/yuki_matsuda_1
 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
@@ -38,7 +38,7 @@ 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
+spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/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
@@ -47,7 +47,7 @@ thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
 themij: Taryn Keppel: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
 thejesster14: Rosa Wolff: /obj/item/device/flashlight/fluff/thejesster14_1
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
-vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
+vinceluk: Seth Sealis: /obj/item/clothing/suit/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
 roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid

config/moderators.txt

@@ -17,5 +17,6 @@ searif
 sparklysheep
 themij
 chinsky
+danny220
 ; Why u no keep list in alphabetical order?! Lazies! Lazies! -Abi
 ; Imma best alphabetiser - Erthilo