Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

code/modules/client/client procs.dm

@@ -52,7 +52,7 @@
 		if(mute_irc)
 			usr << "<span class='warning'You cannot use this as your client has been muted from sending messages to the admins on IRC</span>"
 			return
-		cmd_admin_irc_pm()
+		cmd_admin_irc_pm(href_list["irc_msg"])
 		return
 
 

code/modules/client/preferences_gear.dm

@@ -64,22 +64,36 @@ var/global/list/gear_datums = list()
 	slot = slot_head
 
 /datum/gear/bsec_beret
-	display_name = "beret, blue (security)"
-	path = /obj/item/clothing/head/beret/sec/alt
+	display_name = "beret, navy (officer)"
+	path = /obj/item/clothing/head/beret/sec/navy/officer
 	cost = 1
 	slot = slot_head
 	allowed_roles = list("Security Officer","Head of Security","Warden")
 
+/datum/gear/bsec_beret_warden
+	display_name = "beret, navy (warden)"
+	path = /obj/item/clothing/head/beret/sec/navy/warden
+	cost = 1
+	slot = slot_head
+	allowed_roles = list("Head of Security","Warden")
+
+/datum/gear/bsec_beret_hos
+	display_name = "beret, navy (hos)"
+	path = /obj/item/clothing/head/beret/sec/navy/hos
+	cost = 1
+	slot = slot_head
+	allowed_roles = list("Head of Security")
+
 /datum/gear/eng_beret
 	display_name = "beret, engie-orange"
-	path = /obj/item/clothing/head/beret/eng
+	path = /obj/item/clothing/head/beret/engineering
 	cost = 1
 	slot = slot_head
 //	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
 
 /datum/gear/purp_beret
 	display_name = "beret, purple"
-	path = /obj/item/clothing/head/beret/jan
+	path = /obj/item/clothing/head/beret/purple
 	cost = 1
 	slot = slot_head
 
@@ -378,6 +392,13 @@ var/global/list/gear_datums = list()
 	slot = slot_w_uniform
 	cost = 1
 
+/datum/gear/roboticist_skirt
+	display_name = "skirt, roboticist"
+	path = /obj/item/clothing/under/rank/roboticist/skirt
+	slot = slot_w_uniform
+	cost = 1
+	allowed_roles = list("Roboticist")
+
 /datum/gear/amishsuit
 	display_name = "suit, amish"
 	path = /obj/item/clothing/under/sl_suit

code/modules/client/preferences_savefile.dm

@@ -60,7 +60,7 @@
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
 	lastchangelog	= sanitize_text(lastchangelog, initial(lastchangelog))
-	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight","Orange","old"), initial(UI_style))
+	UI_style		= sanitize_inlist(UI_style, all_ui_styles, initial(UI_style))
 	be_special		= sanitize_integer(be_special, 0, 65535, initial(be_special))
 	default_slot	= sanitize_integer(default_slot, 1, config.character_slots, initial(default_slot))
 	toggles			= sanitize_integer(toggles, 0, 65535, initial(toggles))

code/modules/client/preferences_toggles.dm

@@ -157,41 +157,3 @@
 	prefs.save_preferences()
 	src << "You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible)."
 	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/change_ui()
-	set name = "Change UI"
-	set category = "Preferences"
-	set desc = "Configure your user interface"
-
-	if(!ishuman(usr))
-		usr << "This only for human"
-		return
-
-	var/UI_style_new = input(usr, "Select a style, we recommend White for customization") in list("White", "Midnight", "Orange", "old")
-	if(!UI_style_new) return
-
-	var/UI_style_alpha_new = input(usr, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
-	if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
-
-	var/UI_style_color_new = input(usr, "Choose your UI color, dark colors are not recommended!") as color|null
-	if(!UI_style_color_new) return
-
-	//update UI
-	var/list/icons = usr.hud_used.adding + usr.hud_used.other +usr.hud_used.hotkeybuttons
-	icons.Add(usr.zone_sel)
-
-	for(var/obj/screen/I in icons)
-		if(I.name in list(I_HELP, I_HURT, I_DISARM, I_GRAB)) continue
-		I.icon = ui_style2icon(UI_style_new)
-		I.color = UI_style_color_new
-		I.alpha = UI_style_alpha_new
-
-
-
-	if(alert("Like it? Save changes?",,"Yes", "No") == "Yes")
-		prefs.UI_style = UI_style_new
-		prefs.UI_style_alpha = UI_style_alpha_new
-		prefs.UI_style_color = UI_style_color_new
-		prefs.save_preferences()
-		usr << "UI was saved"

code/modules/client/ui_style.dm

@@ -0,0 +1,58 @@
+
+
+/var/all_ui_styles = list(
+	"Midnight"     = 'icons/mob/screen/midnight.dmi',
+	"Orange"       = 'icons/mob/screen/orange.dmi',
+	"old"          = 'icons/mob/screen/old.dmi',
+	"White"        = 'icons/mob/screen/white.dmi',
+	"old-noborder" = 'icons/mob/screen/old-noborder.dmi'
+	)
+
+/proc/ui_style2icon(ui_style)
+	if(ui_style in all_ui_styles)
+		return all_ui_styles[ui_style]
+	return all_ui_styles["White"]
+
+
+/client/verb/change_ui()
+	set name = "Change UI"
+	set category = "Preferences"
+	set desc = "Configure your user interface"
+
+	if(!ishuman(usr))
+		usr << "<span class='warning'>You must be human to use this verb.</span>"
+		return
+
+	var/UI_style_new = input(usr, "Select a style. White is recommended for customization") as null|anything in all_ui_styles
+	if(!UI_style_new) return
+
+	var/UI_style_alpha_new = input(usr, "Select a new alpha (transparency) parameter for your UI, between 50 and 255") as null|num
+	if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+
+	var/UI_style_color_new = input(usr, "Choose your UI color. Dark colors are not recommended!") as color|null
+	if(!UI_style_color_new) return
+
+	//update UI
+	var/list/icons = usr.hud_used.adding + usr.hud_used.other + usr.hud_used.hotkeybuttons
+	icons.Add(usr.zone_sel)
+	icons.Add(usr.gun_setting_icon)
+	icons.Add(usr.item_use_icon)
+	icons.Add(usr.gun_move_icon)
+	icons.Add(usr.gun_run_icon)
+	icons.Add(usr.radio_use_icon)
+
+	var/icon/ic = all_ui_styles[UI_style_new]
+
+	for(var/obj/screen/I in icons)
+		if(I.name in list(I_HELP, I_HURT, I_DISARM, I_GRAB)) continue
+		I.icon = ic
+		I.color = UI_style_color_new
+		I.alpha = UI_style_alpha_new
+
+
+	if(alert("Like it? Save changes?",,"Yes", "No") == "Yes")
+		prefs.UI_style = UI_style_new
+		prefs.UI_style_alpha = UI_style_alpha_new
+		prefs.UI_style_color = UI_style_color_new
+		prefs.save_preferences()
+		usr << "UI was saved"