Merge branch 'master' into upstream-merge-26965

code/datums/antagonists/datum_cult.dm

@@ -1,3 +1,5 @@
+#define SUMMON_POSSIBILITIES 3
+
 /datum/antagonist/cult
 	var/datum/action/innate/cult/comm/communion = new
 	var/datum/action/innate/cult/mastervote/vote = new
@@ -35,6 +37,11 @@
 		message_admins("Cult Sacrifice: Could not find unconvertable or convertable target. WELP!")
 		GLOB.sac_complete = TRUE
 	SSticker.mode.cult_objectives += "sacrifice"
+	if(!GLOB.summon_spots.len)
+		while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES)
+			var/area/summon = pick(GLOB.sortedAreas - GLOB.summon_spots)
+			if(summon && (summon.z == ZLEVEL_STATION) && summon.valid_territory)
+				GLOB.summon_spots += summon
 	SSticker.mode.cult_objectives += "eldergod"
 
 /datum/antagonist/cult/proc/cult_memorization(datum/mind/cult_mind)
@@ -47,8 +54,9 @@
 					explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role] via invoking a Sacrifice rune with them on it and three acolytes around it."
 				else
 					explanation = "The veil has already been weakened here, proceed to the final objective."
+					GLOB.sac_complete = TRUE
 			if("eldergod")
-				explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie' with nine acolytes on it. You must do this after sacrificing your target."
+				explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie'. <b>The summoning can only be accomplished in [english_list(GLOB.summon_spots)] - where the veil is weak enough for the ritual to begin.</b>"
 		if(!silent)
 			to_chat(current, "<B>Objective #[obj_count]</B>: [explanation]")
 		cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
@@ -112,10 +120,12 @@
 /datum/antagonist/cult/master
 	var/datum/action/innate/cult/master/finalreck/reckoning = new
 	var/datum/action/innate/cult/master/cultmark/bloodmark = new
+	var/datum/action/innate/cult/master/pulse/throwing = new
 
 /datum/antagonist/cult/master/Destroy()
 	QDEL_NULL(reckoning)
 	QDEL_NULL(bloodmark)
+	QDEL_NULL(throwing)
 	return ..()
 
 /datum/antagonist/cult/master/on_gain()
@@ -136,6 +146,7 @@
 	if(!GLOB.reckoning_complete)
 		reckoning.Grant(current)
 	bloodmark.Grant(current)
+	throwing.Grant(current)
 	current.update_action_buttons_icon()
 	current.apply_status_effect(/datum/status_effect/cult_master)
 
@@ -146,5 +157,6 @@
 		current = mob_override
 	reckoning.Remove(current)
 	bloodmark.Remove(current)
+	throwing.Remove(current)
 	current.update_action_buttons_icon()
-	current.remove_status_effect(/datum/status_effect/cult_master)
+	current.remove_status_effect(/datum/status_effect/cult_master)

code/datums/diseases/_disease.dm

@@ -115,12 +115,19 @@
 		else
 			return
 
-	if(isturf(source.loc))
+	var/turf/T = source.loc
+	if(istype(T))
 		for(var/mob/living/carbon/C in oview(spread_range, source))
-			if(isturf(C.loc))
-				if(AStar(source, C.loc,/turf/proc/Distance, spread_range, adjacent = (spread_flags & AIRBORNE) ? /turf/proc/reachableAdjacentAtmosTurfs : /turf/proc/reachableAdjacentTurfs))
-					C.ContractDisease(src)
-
+			var/turf/V = get_turf(C)
+			if(V)
+				while(TRUE)
+					if(V == T)
+						C.ContractDisease(src)
+						break
+					var/turf/Temp = get_step_towards(V, T)
+					if(!CANATMOSPASS(V, Temp))
+						break
+					V = Temp
 
 /datum/disease/process()
 	if(!holder)

code/datums/diseases/advance/symptoms/vomit.dm

@@ -42,7 +42,7 @@ Bonus
 	return
 
 /datum/symptom/vomit/proc/Vomit(mob/living/carbon/M)
-	M.vomit(20)
+	M.vomit(20)
 
 /*
 //////////////////////////////////////
@@ -75,7 +75,7 @@ Bonus
 	severity = 5
 
 /datum/symptom/vomit/blood/Vomit(mob/living/carbon/M)
-	M.vomit(0, 1)
+	M.vomit(0,TRUE)
 
 
 /*
@@ -103,4 +103,4 @@ Bonus
 	level = 4
 
 /datum/symptom/vomit/projectile/Vomit(mob/living/carbon/M)
-	M.vomit(6,0,1,5,1)
+	M.vomit(6, distance = 5)

code/datums/diseases/appendicitis.dm

@@ -31,4 +31,4 @@
 				affected_mob.adjustToxLoss(1)
 		if(3)
 			if(prob(1))
-				affected_mob.vomit(95)
+				affected_mob.vomit(95)

code/datums/explosion.dm

@@ -279,16 +279,9 @@ GLOBAL_LIST_EMPTY(explosions)
 			var/turf/T = affected_turfs[I]
 			var/current_exp_block = T.density ? T.explosion_block : 0
 
-			for(var/obj/machinery/door/D in T)
-				if(D.density)
-					current_exp_block += D.explosion_block
-
-			for(var/obj/structure/window/W in T)
-				if(W.reinf && W.fulltile)
-					current_exp_block += W.explosion_block
-
-			for(var/obj/structure/blob/B in T)
-				current_exp_block += B.explosion_block
+			for(var/obj/O in T)
+				var/the_block = O.explosion_block
+				current_exp_block += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block
 
 			.[T] = current_exp_block
 
@@ -351,20 +344,12 @@ GLOBAL_LIST_EMPTY(explosions)
 			var/turf/TT = T
 			while(TT != epicenter)
 				TT = get_step_towards(TT,epicenter)
-				if(TT.density && TT.explosion_block)
+				if(TT.density)
 					dist += TT.explosion_block
 
-				for(var/obj/machinery/door/D in TT)
-					if(D.density && D.explosion_block)
-						dist += D.explosion_block
-
-				for(var/obj/structure/window/W in TT)
-					if(W.explosion_block && W.fulltile)
-						dist += W.explosion_block
-
-				for(var/obj/structure/blob/B in T)
-					dist += B.explosion_block
-
+				for(var/obj/O in T)
+					var/the_block = O.explosion_block
+					dist += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block
 		if(dist < dev)
 			T.color = "red"
 			T.maptext = "Dev"

code/datums/helper_datums/getrev.dm

@@ -73,13 +73,13 @@
 		return ""
 	. = header ? "The following pull requests are currently test merged:<br>" : ""
 	for(var/line in testmerge)
-		var/cm = testmerge[line]["commit"]
 		var/details
 		if(world.RunningService())
+			var/cm = testmerge[line]["commit"]
 			details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7)))
 		else if(has_pr_details)	//tgs2 support
 			details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["user"]["login"])
-		. += "<a href='[config.githuburl]/pull/[line]'>#[line][details]</a><br>"
+		. += "<a href=\"[config.githuburl]/pull/[line]\">#[line][details]</a><br>"
 
 /client/verb/showrevinfo()
 	set category = "OOC"
@@ -93,7 +93,7 @@
 			to_chat(src, GLOB.revdata.GetTestMergeInfo())
 			prefix = "Based off origin/master commit: "
 		var/pc = GLOB.revdata.originmastercommit
-		to_chat(src, "[prefix]<a href='[config.githuburl]/commit/[pc]'>[copytext(pc, 1, min(length(pc), 7))]</a>")
+		to_chat(src, "[prefix]<a href=\"[config.githuburl]/commit/[pc]\">[copytext(pc, 1, min(length(pc), 7))]</a>")
 	else
 		to_chat(src, "Revision unknown")
 	to_chat(src, "<b>Current Infomational Settings:</b>")

code/datums/mind.dm

@@ -23,7 +23,7 @@
 
 			new_mob.key = key
 
-		The Login proc will handle making a new mob for that mobtype (including setting up stuff like mind.name). Simple!
+		The Login proc will handle making a new mind for that mobtype (including setting up stuff like mind.name). Simple!
 		However if you want that mind to have any special properties like being a traitor etc you will have to do that
 		yourself.
 
@@ -989,7 +989,7 @@
 		if(!G || (src in G.bosses))
 			return
 		SSticker.mode.remove_gangster(src,0,2,1)
-		G.bosses += src
+		G.bosses[src] = GANGSTER_BOSS_STARTING_INFLUENCE
 		gang_datum = G
 		special_role = "[G.name] Gang Boss"
 		G.add_gang_hud(src)

code/datums/mutations.dm

@@ -408,6 +408,11 @@ GLOBAL_LIST_EMPTY(mutations_list)
 /datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner)
 	owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
 
+/datum/mutation/human/chameleon/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
+	if(proximity) //stops tk from breaking chameleon
+		owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
+		return
+	
 /datum/mutation/human/chameleon/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return

code/datums/outfit.dm

@@ -22,6 +22,7 @@
 	var/internals_slot = null //ID of slot containing a gas tank
 	var/list/backpack_contents = null // In the list(path=count,otherpath=count) format
 	var/list/implants = null
+	var/accessory = null
 
 	var/can_be_admin_equipped = TRUE // Set to FALSE if your outfit requires runtime parameters
 
@@ -64,6 +65,13 @@
 	if(suit_store)
 		H.equip_to_slot_or_del(new suit_store(H),slot_s_store)
 
+	if(accessory)
+		var/obj/item/clothing/under/U = H.w_uniform
+		if(U)
+			U.attach_accessory(new accessory(H))
+		else
+			WARNING("Unable to equip accessory [accessory] in outfit [name]. No uniform present!")
+
 	if(l_hand)
 		H.put_in_l_hand(new l_hand(H))
 	if(r_hand)

code/datums/riding.dm

@@ -40,6 +40,8 @@
 			passindex++
 			var/mob/living/buckled_mob = m
 			var/list/offsets = get_offsets(passindex)
+			var/rider_dir = get_rider_dir(passindex)
+			buckled_mob.setDir(rider_dir)
 			dir_loop:
 				for(var/offsetdir in offsets)
 					if(offsetdir == ridden_dir)
@@ -56,6 +58,11 @@
 /datum/riding/proc/get_offsets(pass_index) // list(dir = x, y, layer)
 	return list("[NORTH]" = list(0, 0), "[SOUTH]" = list(0, 0), "[EAST]" = list(0, 0), "[WEST]" = list(0, 0))
 
+//Override this to set the passengers/riders dir based on which passenger they are.
+//ie: rider facing the vehicle's dir, but passenger 2 facing backwards, etc.
+/datum/riding/proc/get_rider_dir(pass_index)
+	return ridden.dir
+
 //KEYS
 /datum/riding/proc/keycheck(mob/user)
 	if(keytype)

code/datums/status_effects/buffs.dm

@@ -232,19 +232,20 @@
 /datum/status_effect/cult_master
 	id = "The Cult Master"
 	duration = -1
-	tick_interval = 100
 	alert_type = null
+	on_remove_on_mob_delete = TRUE
 	var/alive = TRUE
 
 /datum/status_effect/cult_master/proc/deathrattle()
+	if(!QDELETED(GLOB.cult_narsie))
+		return //if nar-sie is alive, don't even worry about it
 	var/area/A = get_area(owner)
 	for(var/datum/mind/B in SSticker.mode.cult)
 		if(isliving(B.current))
 			var/mob/living/M = B.current
 			M << 'sound/hallucinations/veryfar_noise.ogg'
-			to_chat(M, "<span class='cultlarge'>The Cult's Master, [owner], has fallen in the [A]!")
-			
-			
+			to_chat(M, "<span class='cultlarge'>The Cult's Master, [owner], has fallen in \the [A]!</span>")
+
 /datum/status_effect/cult_master/tick()
 	if(owner.stat != DEAD && !alive)
 		alive = TRUE

code/datums/status_effects/neutral.dm

@@ -16,3 +16,43 @@
 	status_type = STATUS_EFFECT_UNIQUE
 	alert_type = null
 	var/total_damage = 0
+
+/datum/status_effect/syphon_mark/on_apply()
+	if(owner.stat == DEAD)
+		return FALSE
+	return ..()
+
+/datum/status_effect/syphon_mark/proc/get_kill()
+	if(reward_target)
+		reward_target.get_kill(owner)
+
+/datum/status_effect/syphon_mark/tick()
+	if(owner.stat == DEAD)
+		get_kill()
+		qdel(src)
+
+/datum/status_effect/syphon_mark/on_remove()
+	get_kill()
+	. = ..()
+
+/datum/status_effect/syphon_mark
+	id = "syphon_mark"
+	duration = 50
+	status_type = STATUS_EFFECT_MULTIPLE
+	alert_type = null
+	on_remove_on_mob_delete = TRUE
+	var/obj/item/borg/upgrade/modkit/bounty/reward_target
+
+/datum/status_effect/syphon_mark/on_apply()
+	if(owner.stat == DEAD)
+		return FALSE
+	return ..()
+
+/datum/status_effect/syphon_mark/tick()
+	if(owner.stat == DEAD)
+		get_kill()
+		qdel(src)
+
+/datum/status_effect/syphon_mark/on_remove()
+	get_kill()
+	. = ..()

code/datums/verbs.dm

@@ -0,0 +1,101 @@
+/datum/verbs
+	var/name
+	var/list/children
+	var/datum/verbs/parent
+	var/list/verblist
+	var/abstract = FALSE
+
+//returns the master list for verbs of a type
+/datum/verbs/proc/GetList()
+	CRASH("Abstract verblist for [type]")
+
+//do things for each entry in Generate_list
+//return value sets Generate_list[verbpath]
+/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
+
+/datum/verbs/New()
+	var/mainlist = GetList()
+	var/ourentry = mainlist[type]
+	children = list()
+	verblist = list()
+	if (ourentry)
+		if (!islist(ourentry)) //some of our childern already loaded
+			qdel(src)
+			CRASH("Verb double load: [type]")
+		Add_children(ourentry)
+
+	mainlist[type] = src
+
+	Load_verbs(type, typesof("[type]/verb"))
+
+	var/datum/verbs/parent = mainlist[parent_type]
+	if (!parent)
+		mainlist[parent_type] = list(src)
+	else if (islist(parent))
+		parent += src
+	else
+		parent.Add_children(list(src))
+
+/datum/verbs/proc/Set_parent(datum/verbs/_parent)
+	parent = _parent
+	if (abstract)
+		parent.Add_children(children)
+		var/list/verblistoftypes = list()
+		for(var/thing in verblist)
+			LAZYADD(verblistoftypes[verblist[thing]], thing)
+
+		for(var/verbparenttype in verblistoftypes)
+			parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype])
+
+/datum/verbs/proc/Add_children(list/kids)
+	if (abstract && parent)
+		parent.Add_children(kids)
+		return
+
+	for(var/thing in kids)
+		var/datum/verbs/item = thing
+		item.Set_parent(src)
+		if (!item.abstract)
+			children += item
+
+/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs)
+	if (abstract && parent)
+		parent.Load_verbs(verb_parent_type, verbs)
+		return
+
+	for (var/verbpath in verbs)
+		verblist[verbpath] = verb_parent_type
+
+/datum/verbs/proc/Generate_list(...)
+	. = list()
+	if (length(children))
+		for (var/thing in children)
+			var/datum/verbs/child = thing
+			var/list/childlist = child.Generate_list(arglist(args))
+			if (childlist)
+				var/childname = "[child]"
+				if (childname == "[child.type]")
+					var/list/tree = splittext(childname, "/")
+					childname = tree[tree.len]
+				.[child.type] = "parent=[url_encode(type)];name=[url_encode(childname)]"
+				. += childlist
+
+	for (var/thing in verblist)
+		var/atom/verb/verbpath = thing
+		if (!verbpath)
+			stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
+		var/list/entry = list()
+		entry["parent"] = "[type]"
+		entry["name"] = verbpath.desc
+		if (copytext(verbpath.name,1,2) == "@")
+			entry["command"] = copytext(verbpath.name,2)
+		else
+			entry["command"] = replacetext(verbpath.name, " ", "-")
+
+		.[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args))
+
+/world/proc/LoadVerbs(verb_type)
+	if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs)
+		CRASH("Invalid verb_type: [verb_type]")
+	for (var/typepath in subtypesof(verb_type))
+		new typepath()