Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -209,7 +209,7 @@
     name = "Puffy Dress"
     category = slot_wear_suit
     path = /obj/item/clothing/suit/puffydress
-    //ckeywhitelist = //Don't know their ckey yet
+    ckeywhitelist = list("stallingratt")
 
 /datum/gear/labredblack
     name = "Black and Red Coat"
@@ -217,6 +217,18 @@
     path = /obj/item/clothing/suit/toggle/labcoat/labredblack
     ckeywhitelist = list("blakeryan")
 
+/datum/gear/darksabre
+	name = "Dark Sabre"
+	category = slot_in_backpack
+	path = /obj/item/toy/sword/darksabre
+	ckeywhitelist = list("inferno707")
+
+datum/gear/darksabresheath
+	name = "Dark Sabre Sheath"
+	category = slot_in_backpack
+	path = /obj/item/storage/belt/sabre/darksabre
+	ckeywhitelist = list("inferno707")
+
 
 
 

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -322,3 +322,31 @@
 			H.arousalloss = H.max_arousal / 3
 		if(prob(5) && H.hallucination < 15)
 			H.hallucination += 10
+
+/obj/item/toy/sword/darksabre
+	name = "Kiara's Sabre"
+	desc = "This blade looks as dangerous as its owner."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "darksabre"
+	item_state = "darksabre"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("attacked", "struck", "hit")
+
+
+/obj/item/storage/belt/sabre/darksabre
+	name = "Ornate Sheathe"
+	desc = "An ornate and rather sinister looking sabre sheathe."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	storage_slots = 1
+	rustle_jimmies = FALSE
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_BULKY
+	can_hold = list(
+		/obj/item/toy/sword/darksabre
+		)

modular_citadel/code/modules/mentor/mentorpm.dm

@@ -31,11 +31,15 @@
 		else		mentorhelp(msg)	//Mentor we are replying to left. Mentorhelp instead(check below)
 		return
 
+	if(is_mentor(whom))
+		to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has started replying to [whom]'s mhelp.</font color>")
+
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
 		msg = input(src,"Message:", "Private message") as text|null
-
-		if(!msg)
+		
+		if(!msg && is_mentor(whom))
+			to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has stopped their reply to [whom]'s mhelp.</font color>")
 			return
 
 		if(!C)
@@ -50,7 +54,9 @@
 			return
 
 	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
-	if(!msg)	return
+	if(!msg && is_mentor(whom))	
+		to_chat(GLOB.admins | GLOB.mentors, "<font color='purple'>[src] has stopped their reply to [whom]'s mhelp.</font color>")
+		return
 
 	log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]")
 

modular_citadel/code/modules/vore/eating/living_vr.dm

@@ -324,19 +324,23 @@
 //	Verb for saving vore preferences to save file
 //
 /mob/living/proc/save_vore_prefs()
-	if(!(client || client.prefs_vr))
+	if(!client)
+		return FALSE
+	if(client && !client.prefs_vr)
 		return FALSE
 	if(!copy_to_prefs_vr())
 		return FALSE
-	if(!client.prefs_vr.save_vore())
+	if(client && !client.prefs_vr.save_vore())
 		return FALSE
 
 	return TRUE
 
 /mob/living/proc/apply_vore_prefs()
-	if(!(client || client.prefs_vr))
+	if(!client)
 		return FALSE
-	if(!client.prefs_vr.load_vore())
+	if(client && !client.prefs_vr)
+		return FALSE
+	if(client && !client.prefs_vr.load_vore())
 		return FALSE
 	if(!copy_from_prefs_vr())
 		return FALSE
@@ -344,7 +348,9 @@
 	return TRUE
 
 /mob/living/proc/copy_to_prefs_vr()
-	if(!client || !client.prefs_vr)
+	if(!client)
+		return FALSE
+	if(client && !client.prefs_vr)
 		src << "<span class='warning'>You attempted to save your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.</span>"
 		return FALSE
 
@@ -367,7 +373,9 @@
 //	Proc for applying vore preferences, given bellies
 //
 /mob/living/proc/copy_from_prefs_vr()
-	if(!client || !client.prefs_vr)
+	if(!client)
+		return FALSE
+	if(client && !client.prefs_vr)
 		src << "<span class='warning'>You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.</span>"
 		return FALSE
 
@@ -433,7 +441,7 @@
 	if(src == stat)
 		return
 
-	src.setClickCooldown(50)
+	src.setClickCooldown(100)
 
 	src.visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")