Merge branch '13113'

code/game/atoms.dm

@@ -1121,3 +1121,11 @@
 				max_grav = max(G.setting,max_grav)
 			return max_grav
 	return SSmapping.level_trait(T.z, ZTRAIT_GRAVITY)
+
+/**
+  * Causes effects when the atom gets hit by a rust effect from heretics
+  *
+  * Override this if you want custom behaviour in whatever gets hit by the rust
+  */
+/atom/proc/rust_heretic_act()
+	return 

code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm

@@ -191,6 +191,24 @@
 		SSticker.mode_result = "loss - rev heads killed"
 		SSticker.news_report = REVS_LOSE
 
+//////////////////////////////////////////////
+//                                          //
+//           HERETIC SMUGGLER          		//
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/latejoin/heretic_smuggler
+	name = "Heretic Smuggler"
+	antag_datum = /datum/antagonist/heretic
+	antag_flag = ROLE_HERETIC
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+	restricted_roles = list("AI","Cyborg")
+	required_candidates = 1
+	weight = 4
+	cost = 10
+	requirements = list(40,30,20,10,10,10,10,10,10,10)
+	repeatable = TRUE
+
 //////////////////////////////////////////////
 //                                          //
 //               BLOODSUCKERS               //

code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm

@@ -143,6 +143,46 @@
 		changeling.add_antag_datum(new_antag)
 	return TRUE
 
+//////////////////////////////////////////////
+//                                          //
+//              ELDRITCH CULT               //
+//                                          //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/roundstart/heretics
+	name = "Heretics"
+	antag_flag = ROLE_HERETIC
+	antag_datum = /datum/antagonist/heretic
+	protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain")
+	restricted_roles = list("AI", "Cyborg")
+	required_candidates = 1
+	weight = 3
+	cost = 20
+	scaling_cost = 15
+	requirements = list(50,45,45,40,35,20,20,15,10,10)
+	antag_cap = list(1,1,1,1,2,2,2,2,3,3)
+
+
+/datum/dynamic_ruleset/roundstart/heretics/pre_execute()
+	. = ..()
+	var/num_ecult = antag_cap[indice_pop] * (scaled_times + 1)
+
+	for (var/i = 1 to num_ecult)
+		var/mob/picked_candidate = pick_n_take(candidates)
+		assigned += picked_candidate.mind
+		picked_candidate.mind.restricted_roles = restricted_roles
+		picked_candidate.mind.special_role = ROLE_HERETIC
+	return TRUE
+
+/datum/dynamic_ruleset/roundstart/heretics/execute()
+
+	for(var/c in assigned)
+		var/datum/mind/cultie = c
+		var/datum/antagonist/heretic/new_antag = new antag_datum()
+		cultie.add_antag_datum(new_antag)
+
+	return TRUE
+
 //////////////////////////////////////////////
 //                                          //
 //               WIZARDS                    //

code/game/gamemodes/eldritch_cult/eldritch_cult.dm

@@ -0,0 +1,67 @@
+/datum/game_mode/heretics
+	name = "heresy"
+	config_tag = "heresy"
+	antag_flag = ROLE_HERETIC
+	false_report_weight = 5
+	restricted_jobs = list("AI", "Cyborg")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")	//citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist
+	required_players = 15
+	required_enemies = 1
+	recommended_enemies = 4
+	reroll_friendly = 1
+	enemy_minimum_age = 0
+	round_ends_with_antag_death = 0
+
+	announce_span = "danger"
+	announce_text = "Heretics have been spotted on the station!\n\
+	<span class='danger'>Heretics</span>: Accomplish your objectives.\n\
+	<span class='notice'>Crew</span>: Do not let the madman succeed!"
+
+	var/ecult_possible = 4 //hard limit on culties if scaling is turned off
+	var/num_ecult = 1
+	var/list/culties = list()
+
+/datum/game_mode/heretics/pre_setup()
+
+	if(CONFIG_GET(flag/protect_roles_from_antagonist))
+		restricted_jobs += protected_jobs
+
+	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
+		restricted_jobs += "Assistant"
+
+
+	var/esc = CONFIG_GET(number/ecult_scaling_coeff)
+	if(esc)
+		num_ecult = min(max(1, min(round(num_players() / (esc * 2)) + 2, round(num_players() / esc))),4)
+	else
+		num_ecult = max(1, min(num_players(), ecult_possible))
+
+	for(var/i in 1 to num_ecult)
+		if(!antag_candidates.len)
+			break
+		var/datum/mind/cultie = antag_pick(antag_candidates)
+		antag_candidates -= cultie
+		cultie.special_role = ROLE_HERETIC
+		cultie.restricted_roles = restricted_jobs
+		culties += cultie
+
+	var/enough_heretics = culties.len > 0
+
+	if(!enough_heretics)
+		setup_error = "Not enough heretic candidates"
+		return FALSE
+	else
+		for(var/antag in culties)
+		return TRUE
+
+/datum/game_mode/heretics/post_setup()
+	for(var/c in culties)
+		var/datum/mind/cultie = c
+		log_game("[key_name(cultie)] has been selected as a heretic!")
+		var/datum/antagonist/heretic/new_antag = new()
+		cultie.add_antag_datum(new_antag)
+	return ..()
+
+/datum/game_mode/heretics/generate_report()
+	return "Cybersun Industries has announced that they have successfully raided a high-security library. The library contained a very dangerous book that was \
+	shown to posses anomalous properties. We suspect that the book has been copied over, Stay vigilant!"

code/game/machinery/_machinery.dm

@@ -547,3 +547,6 @@ Class Procs:
 	. = . % 9
 	AM.pixel_x = -8 + ((.%3)*8)
 	AM.pixel_y = -8 + (round( . / 3)*8)
+
+/obj/machinery/rust_heretic_act()
+	take_damage(500, BRUTE, "melee", 1) 

code/game/mecha/mecha.dm

@@ -153,6 +153,9 @@
 /obj/mecha/get_cell()
 	return cell
 
+/obj/mecha/rust_heretic_act()
+	take_damage(500,  BRUTE)
+
 /obj/mecha/Destroy()
 	go_out()
 	var/mob/living/silicon/ai/AI

code/game/objects/items/granters.dm

@@ -253,7 +253,7 @@
 		user.set_nutrition(NUTRITION_LEVEL_STARVING + 50)
 
 /obj/item/book/granter/spell/blind
-	spell = /obj/effect/proc_holder/spell/targeted/trigger/blind
+	spell = /obj/effect/proc_holder/spell/pointed/trigger/blind
 	spellname = "blind"
 	icon_state ="bookblind"
 	desc = "This book looks blurry, no matter how you look at it."
@@ -265,7 +265,7 @@
 	user.blind_eyes(10)
 
 /obj/item/book/granter/spell/mindswap
-	spell = /obj/effect/proc_holder/spell/targeted/mind_transfer
+	spell = /obj/effect/proc_holder/spell/pointed/mind_transfer
 	spellname = "mindswap"
 	icon_state ="bookmindswap"
 	desc = "This book's cover is pristine, though its pages look ragged and torn."
@@ -289,7 +289,7 @@
 	if(stored_swap == user)
 		to_chat(user,"<span class='notice'>You stare at the book some more, but there doesn't seem to be anything else to learn...</span>")
 		return
-	var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new
+	var/obj/effect/proc_holder/spell/pointed/mind_transfer/swapper = new
 	if(swapper.cast(list(stored_swap), user, TRUE, TRUE))
 		to_chat(user,"<span class='warning'>You're suddenly somewhere else... and someone else?!</span>")
 		to_chat(stored_swap,"<span class='warning'>Suddenly you're staring at [src] again... where are you, who are you?!</span>")
@@ -324,7 +324,7 @@
 	user.DefaultCombatKnockdown(40)
 
 /obj/item/book/granter/spell/barnyard
-	spell = /obj/effect/proc_holder/spell/targeted/barnyardcurse
+	spell = /obj/effect/proc_holder/spell/pointed/barnyardcurse
 	spellname = "barnyard"
 	icon_state ="bookhorses"
 	desc = "This book is more horse than your mind has room for."

code/game/objects/structures.dm

@@ -112,3 +112,6 @@
 		if(0 to 25)
 			if(!broken)
 				return  "<span class='warning'>It's falling apart!</span>"
+
+/obj/structure/rust_heretic_act()
+	take_damage(500, BRUTE, "melee", 1) 

code/game/turfs/closed.dm

@@ -29,6 +29,9 @@
 	icon = 'icons/turf/walls.dmi'
 	explosion_block = 50
 
+/turf/closed/indestructible/rust_heretic_act()
+	return
+
 /turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
 	return
 
@@ -198,13 +201,13 @@
 	
 /turf/closed/indestructible/rock/glacierrock
 	name = "unaturally hard ice wall"
-	desc = "Ice, hardened over thousands of years, you're not breaking through this." 
+	desc = "Ice, hardened over thousands of years, you're not breaking through this."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "snow_rock"
 	
 /turf/closed/indestructible/rock/glacierrock/blue
 	name = "blue ice wall"
-	desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color." 
+	desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "ice"
 	canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -63,6 +63,11 @@
 				to_chat(user, "<span class='notice'>You forcefully pry off the planks, destroying them in the process.</span>")
 	return make_plating()
 
+/turf/open/floor/wood/rust_heretic_act()
+	if(prob(70))
+		new /obj/effect/temp_visual/glowing_rune(src)
+	ChangeTurf(/turf/open/floor/plating/rust)
+
 /turf/open/floor/wood/cold
 	temperature = 255.37
 

code/game/turfs/simulated/floor/misc_floor.dm

@@ -267,3 +267,15 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "floor_padded"
 	floor_tile = /obj/item/stack/tile/padded
+
+/turf/open/floor/plating/rust
+	name = "rusted plating"
+	desc = "Corrupted steel."
+	icon_state = "plating_rust"
+	footstep = FOOTSTEP_RUST
+	barefootstep = FOOTSTEP_RUST
+	clawfootstep = FOOTSTEP_RUST
+	heavyfootstep = FOOTSTEP_RUST
+
+/turf/open/floor/plating/rust/rust_heretic_act()
+	return 

code/game/turfs/simulated/floor/plasteel_floor.dm

@@ -8,6 +8,11 @@
 	. = ..()
 	. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
 
+/turf/open/floor/plasteel/rust_heretic_act()
+	if(prob(70))
+		new /obj/effect/temp_visual/glowing_rune(src)
+	ChangeTurf(/turf/open/floor/plating/rust)
+
 /turf/open/floor/plasteel/update_icon()
 	if(!..())
 		return 0

code/game/turfs/simulated/floor/plating.dm

@@ -98,6 +98,11 @@
 
 	return TRUE
 
+/turf/open/floor/plating/rust_heretic_act()
+	if(prob(70))
+		new /obj/effect/temp_visual/glowing_rune(src)
+	ChangeTurf(/turf/open/floor/plating/rust)
+
 /turf/open/floor/plating/make_plating()
 	return
 

code/game/turfs/simulated/wall/misc_walls.dm

@@ -188,12 +188,20 @@
 	icon = 'icons/turf/walls/rusty_wall.dmi'
 	hardness = 45
 
+/turf/closed/wall/rust/rust_heretic_act()
+	ScrapeAway()
+
 /turf/closed/wall/r_wall/rust
 	name = "rusted reinforced wall"
 	desc = "A huge chunk of rusted reinforced metal."
 	icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
 	hardness = 15
 
+/turf/closed/wall/r_wall/rust/rust_heretic_act()
+	if(prob(50))
+		return
+	ScrapeAway()
+
 /turf/closed/wall/mineral/bronze
 	name = "clockwork wall"
 	desc = "A huge chunk of bronze, decorated like gears and cogs."

code/game/turfs/simulated/wall/reinf_walls.dm

@@ -235,6 +235,13 @@
 	if(the_rcd.canRturf)
 		return ..()
 
+/turf/closed/wall/r_wall/rust_heretic_act()
+	if(prob(50))
+		return
+	if(prob(70))
+		new /obj/effect/temp_visual/glowing_rune(src)
+	ChangeTurf(/turf/closed/wall/r_wall/rust)
+
 /turf/closed/wall/r_wall/syndicate
 	name = "hull"
 	desc = "The armored hull of an ominous looking ship."

code/game/turfs/simulated/walls.dm

@@ -325,4 +325,9 @@
 
 	add_overlay(dent_decals)
 
+/turf/closed/wall/rust_heretic_act()
+	if(prob(70))
+		new /obj/effect/temp_visual/glowing_rune(src)
+	ChangeTurf(/turf/closed/wall/rust)
+
 #undef MAX_DENT_DECALS