Merge remote-tracking branch 'upstream/master' into RBMK_Branch_Simple

code/modules/admin/verbs/adminhelp.dm

@@ -249,6 +249,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(!ref_src)
 		ref_src = "[REF(src)]"
 	. = " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=reject'>REJT</A>)"
+	. = " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=mentor'>MENTOR</A>)"
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=icissue'>IC</A>)"
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=close'>CLOSE</A>)"
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=resolve'>RSLVE</A>)"
@@ -379,6 +380,27 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	AddInteraction("Rejected by [key_name].")
 	Close(silent = TRUE)
 
+//Resolve ticket with mentor
+/datum/admin_help/proc/Mentor(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return
+
+	if(initiator)
+		initiator.giveadminhelpverb()
+
+		SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))
+
+		to_chat(initiator, "<font color='yellow' size='4'><b>- AdminHelp Declined -</b></font>")
+		to_chat(initiator, "<font color='yellow'><b>Your admin help was declined.</b> The adminhelp verb has been returned to you so that you may try again later.</font>")
+		to_chat(initiator, "The question/request is considered a mentor issue, please direct questions on how to play to the in-games mentor help, or asking in the discord without revealing infomation of the round.")
+
+	SSblackbox.record_feedback("tally", "ahelp_stats", 1, "rejected")
+	var/msg = "Ticket [TicketHref("#[id]")] rejected (Mentor) by [key_name]"
+	message_admins(msg)
+	log_admin_private(msg)
+	AddInteraction("Rejected by [key_name].")
+	Close(silent = TRUE)
+
 //Resolve ticket with IC Issue message
 /datum/admin_help/proc/ICIssue(key_name = key_name_admin(usr))
 	if(state != AHELP_ACTIVE)
@@ -465,6 +487,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 			Retitle()
 		if("reject")
 			Reject()
+		if("mentor")
+			Mentor()
 		if("reply")
 			usr.client.cmd_ahelp_reply(initiator)
 		if("icissue")

code/modules/admin/verbs/adminpm.dm

@@ -217,7 +217,7 @@
 
 
 
-#define IRC_AHELP_USAGE "Usage: ticket <close|resolve|icissue|reject|reopen \[ticket #\]|list>"
+#define IRC_AHELP_USAGE "Usage: ticket <close|resolve|icissue|reject|mentor|reopen \[ticket #\]|list>"
 /proc/IrcPm(target,msg,sender)
 	target = ckey(target)
 	var/client/C = GLOB.directory[target]
@@ -246,6 +246,10 @@
 				if(ticket)
 					ticket.Reject(irc_tagged)
 					return "Ticket #[ticket.id] successfully rejected"
+			if("mentor")
+				if(ticket)
+					ticket.Mentor(irc_tagged)
+					return "Ticket #[ticket.id] successfully rejected"
 			if("reopen")
 				if(ticket)
 					return "Error: [target] already has ticket #[ticket.id] open"

code/modules/cargo/bounties/assistant.dm

@@ -236,3 +236,10 @@
 	reward = 2250
 	required_count = 5
 	wanted_types = list(/obj/structure/chair/plaswood)
+
+/datum/bounty/item/assistant/condom
+	name = "Filled Condom"
+	description = "Something wack is happening at Central Command, and now they requested some filled condoms?"
+	reward = 1150
+	required_count = 5
+	wanted_types = list(/obj/item/condom/filled)

code/modules/cargo/exports/lewd.dm

@@ -0,0 +1,7 @@
+
+//Condom
+/datum/export/gear/condom
+	cost = 150
+	unit_name = "filled condom"
+	export_types = list(/obj/item/condom/filled)
+	include_subtypes = TRUE

code/modules/mob/living/carbon/life.dm

@@ -556,6 +556,15 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 
 	var/restingpwr = 1 + 4 * resting
 
+	if(ckey)
+		if(!client && !(stat == DEAD))
+			add_status_indicator("ssd")
+			SSD = TRUE
+		else
+			if(SSD)
+				remove_status_indicator("ssd")
+				SSD = FALSE
+
 	//Dizziness
 	if(dizziness)
 		var/client/C = client

code/modules/mob/living/living_defines.dm

@@ -59,9 +59,10 @@
 	var/custom_body_size = 100
 	var/breedable = 0
 	var/impregchance = 30
-//h13 noncon settings
+//h13 settings
 	var/Noncon = 0
 	var/ERP = 0
+	var/SSD = FALSE
 
 	var/mob_biotypes = MOB_ORGANIC
 	var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..

code/modules/mob/living/simple_animal/friendly/goliathbaby.dm

@@ -0,0 +1,34 @@
+/mob/living/simple_animal/babygoliath
+	name = "baby Goliath"
+	desc = "It's a baby goliath, like the hulking demons but much smaller and cuter."
+	icon = 'icons/mob/pets.dmi'
+	icon_state = "goliath_baby"
+	icon_living = "goliath_baby"
+	icon_dead = "goliath_baby_dead"
+	speak = list("Grrr!","Grrr.","Grrr?")
+	speak_emote = list("hisses", "rumbles")
+	emote_hear = list("hisses.", "rumbles.")
+	emote_see = list("grows tentacles below.", "shakes.")
+	speak_chance = 1
+	turns_per_move = 3
+	blood_volume = 250
+	see_in_dark = 5
+	maxHealth = 15
+	health = 15
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/goliath = 1)
+	response_help = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm = "stamps on"
+	density = FALSE
+	pass_flags = PASSTABLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	mob_biotypes = MOB_ORGANIC|MOB_BEAST
+	gold_core_spawnable = FRIENDLY_SPAWN
+	do_footstep = TRUE
+
+//miner babie
+/mob/living/simple_animal/babygoliath/Pebbles
+	name = "Pebbles"
+	desc = "Hatched from an egg stolen from a goliath nest, Pebbles stands guard for miners. She's probably tame."
+	gender = FEMALE
+	gold_core_spawnable = NO_SPAWN

code/modules/mob/living/simple_animal/friendly/possum.dm

@@ -0,0 +1,34 @@
+/mob/living/simple_animal/opossum
+	name = "opossum"
+	desc = "It's an opossum, a small scavenging marsupial."
+	icon = 'icons/mob/pets.dmi'
+	icon_state = "possum"
+	icon_living = "possum"
+	icon_dead = "possum_dead"
+	speak = list("Hiss!","HISS!","Hissss?")
+	speak_emote = list("hisses")
+	emote_hear = list("hisses.")
+	emote_see = list("runs in a circle.", "shakes.")
+	speak_chance = 1
+	turns_per_move = 3
+	blood_volume = 250
+	see_in_dark = 5
+	maxHealth = 15
+	health = 15
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+	response_help = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm = "stamps on"
+	density = FALSE
+	pass_flags = PASSTABLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	mob_biotypes = MOB_ORGANIC|MOB_BEAST
+	gold_core_spawnable = FRIENDLY_SPAWN
+	do_footstep = TRUE
+
+//cargo poss
+/mob/living/simple_animal/opossum/Trims
+	name = "Trims"
+	desc = "Trims, the trash eating opossum! Don't mind the screaming from cargo."
+	gender = MALE
+	gold_core_spawnable = NO_SPAWN

code/modules/mob/living/simple_animal/friendly/skunk.dm

@@ -0,0 +1,38 @@
+/mob/living/simple_animal/skunk
+	name = "skunk"
+	desc = "A skunk! Originally found stinking up Terran planets, now here to stink your station."
+	icon = 'icons/mob/pets.dmi'
+	icon_state = "skunk"
+	icon_living = "skunk"
+	icon_dead = "skunk_dead"
+	speak = list("Hsss!","Eek!","Grrr?")
+	speak_emote = list("screeches", "grumbles")
+	emote_hear = list("screeches.", "grumbles.")
+	emote_see = list("thumps.", "shakes.")
+	speak_chance = 1
+	turns_per_move = 3
+	blood_volume = 250
+	see_in_dark = 5
+	maxHealth = 15
+	health = 15
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+	response_help = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm = "stamps on"
+	density = FALSE
+	pass_flags = PASSTABLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	mob_biotypes = MOB_ORGANIC|MOB_BEAST
+	gold_core_spawnable = FRIENDLY_SPAWN
+	do_footstep = TRUE
+
+//rnd skook boi supreme
+/mob/living/simple_animal/skunk/Bandit
+	name = "Bandit"
+	desc = "Despite his name, he's not very good at stealing things. He was found on board after an invasion of marsupials were cleared out."
+	gender = MALE
+	gold_core_spawnable = NO_SPAWN
+
+/mob/living/simple_animal/skunk/Skook
+	name = "Skook"
+	desc = "A skook!"

code/modules/mob/typing_indicator.dm

@@ -52,5 +52,6 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	icon = 'icons/mob/talk.dmi'
 	icon_state = "normal_typing"
+
 	appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
 	layer = ABOVE_FLY_LAYER