Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master

ffs

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

@@ -511,6 +511,12 @@
 	path = /obj/item/bedsheet/cosmos
 	ckeywhitelist = list("grunnyyy")
 
+/datum/gear/donator/customskirt
+	name = "custom atmos skirt"
+	slot = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/under/custom/customskirt
+	ckeywhitelist = list("thakyz")
+
 /datum/gear/donator/hisakaki
 	name = "halo"
 	slot = SLOT_HEAD

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -551,10 +551,18 @@
 	icon_state = "polyce"
 	poly_colors = list("#808080", "#8CC6FF", "#FF3535")
 
+/obj/item/clothing/under/custom/customskirt
+	name = "unzipped atmos skirt"
+	desc = "atmos jumpsuit skirt with the top half zipped down and wrapped around the waist."
+	icon_state = "atmos_skirt"
+	item_state = "atmos_skirt"
+	icon = 'icons/obj/custom.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+
 /obj/item/clothing/head/halo
 	name = "transdimensional halo"
 	desc = "An oddly shaped halo that magically hovers above the head."
 	icon_state = "halo"
 	item_state = "halo"
-	icon = 'icons/obj/custom.dmi'
+	icon = 'icons/mob/clothing/custom_w.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'

modular_citadel/code/modules/mentor/dementor.dm

@@ -7,7 +7,7 @@
 	if (/client/proc/mentor_unfollow in verbs)
 		mentor_unfollow()
 	GLOB.mentors -= src
-	verbs += /client/proc/cmd_mentor_rementor
+	add_verb(src, /client/proc/cmd_mentor_rementor)
 	
 /client/proc/cmd_mentor_rementor()
 	set category = "Mentor"
@@ -16,4 +16,4 @@
 		return
 	add_mentor_verbs()
 	GLOB.mentors += src
-	verbs -= /client/proc/cmd_mentor_rementor
+	remove_verb(src, /client/proc/cmd_mentor_rementor)

modular_citadel/code/modules/mentor/follow.dm

@@ -5,7 +5,7 @@
 	if(!isobserver(usr))
 		mentor_datum.following = M
 		usr.reset_perspective(M)
-		verbs += /client/proc/mentor_unfollow
+		add_verb(usr, /client/proc/mentor_unfollow)
 		to_chat(usr, "<span class='info'>Click the <a href='?_src_=mentor;mentor_unfollow=[REF(M)];[MentorHrefToken(TRUE)]'>\"Stop Following\"</a> button here or in the Mentor tab to stop following [key_name(M)].</span>")
 		orbiting = FALSE
 	else
@@ -22,7 +22,7 @@
 	if(!is_mentor())
 		return
 	usr.reset_perspective()
-	verbs -= /client/proc/mentor_unfollow
+	remove_verb(usr, /client/proc/mentor_unfollow)
 	to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(mentor_datum.following)].</span>")
 	log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)].")
-	mentor_datum.following = null
+	mentor_datum.following = null

modular_citadel/code/modules/mentor/mentor_verbs.dm

@@ -7,7 +7,7 @@ GLOBAL_PROTECT(mentor_verbs)
 
 /client/proc/add_mentor_verbs()
 	if(mentor_datum)
-		verbs += GLOB.mentor_verbs
+		add_verb(src, GLOB.mentor_verbs)
 
 /client/proc/remove_mentor_verbs()
-	verbs -= GLOB.mentor_verbs
+	remove_verb(src, GLOB.mentor_verbs)

modular_citadel/code/modules/mentor/mentorhelp.dm

@@ -3,12 +3,12 @@
 	set name = "Mentorhelp"
 
 	//clean the input msg
-	if(!msg)	return
+	if(!msg)	
+		return
 
 	//remove out mentorhelp verb temporarily to prevent spamming of mentors.
-	verbs -= /client/verb/mentorhelp
-	spawn(300)
-		verbs += /client/verb/mentorhelp	// 30 second cool-down for mentorhelp
+	remove_verb(src, /client/verb/mentorhelp)
+	addtimer(CALLBACK(GLOBAL_PROC, /proc/add_verb, src, /client/verb/mentorhelp), 30 SECONDS)
 
 	msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
 	if(!msg || !mob)
@@ -95,4 +95,4 @@
 	if(include_follow)
 		. += " (<a href='?_src_=mentor;mentor_follow=[REF(M)];[MentorHrefToken(TRUE)]'>F</a>)"
 
-	return .
+	return .