Merge remote-tracking branch 'citadel/master' into eldritch_affairs

code/game/gamemodes/clown_ops/bananium_bomb.dm

@@ -4,23 +4,17 @@
 	icon = 'icons/obj/machines/nuke.dmi'
 	icon_state = "bananiumbomb_base"
 
-/obj/machinery/nuclearbomb/syndicate/bananium/update_icon()
-	if(deconstruction_state == NUKESTATE_INTACT)
-		switch(get_nuke_state())
-			if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
-				icon_state = "bananiumbomb_base"
-				update_icon_interior()
-				update_icon_lights()
-			if(NUKE_ON_TIMING)
-				cut_overlays()
-				icon_state = "bananiumbomb_timing"
-			if(NUKE_ON_EXPLODING)
-				cut_overlays()
-				icon_state = "bananiumbomb_exploding"
-	else
+/obj/machinery/nuclearbomb/syndicate/bananium/update_icon_state()
+	if(deconstruction_state != NUKESTATE_INTACT)
 		icon_state = "bananiumbomb_base"
-		update_icon_interior()
-		update_icon_lights()
+		return
+	switch(get_nuke_state())
+		if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
+			icon_state = "bananiumbomb_base"
+		if(NUKE_ON_TIMING)
+			icon_state = "bananiumbomb_timing"
+		if(NUKE_ON_EXPLODING)
+			icon_state = "bananiumbomb_exploding"
 
 /obj/machinery/nuclearbomb/syndicate/bananium/get_cinematic_type(off_station)
 	switch(off_station)

code/game/gamemodes/clown_ops/clown_weapons.dm

@@ -40,14 +40,14 @@
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize()
 	. = ..()
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
-	bananium.insert_amount(max_recharge, MAT_BANANIUM)
+	bananium.insert_amount_mat(max_recharge, /datum/material/bananium)
 	START_PROCESSING(SSobj, src)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process()
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
-	var/bananium_amount = bananium.amount(MAT_BANANIUM)
+	var/bananium_amount = bananium.get_material_amount(/datum/material/bananium)
 	if(bananium_amount < max_recharge)
-		bananium.insert_amount(min(recharge_rate, max_recharge - bananium_amount), MAT_BANANIUM)
+		bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/bananium)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user)
 	ui_action_click(user)

code/game/gamemodes/dynamic/dynamic.dm

@@ -672,7 +672,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
 		// Time to inject some threat into the round
 		if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone
 			return
-		if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+		if(SSshuttle.endvote_passed) // no rules after shuttle call is voted
 			return
 		message_admins("DYNAMIC: Checking for midround injection.")
 		log_game("DYNAMIC: Checking for midround injection.")
@@ -748,7 +748,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
 		return
 	if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left
 		return
-	if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+	if(SSshuttle.endvote_passed) // no rules after shuttle is auto-called
 		return
 	update_playercounts()
 

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -746,7 +746,7 @@
 	Mind.add_antag_datum(ninjadatum)
 
 	if(Ninja.mind != Mind)			//something has gone wrong!
-		throw EXCEPTION("Ninja created with incorrect mind")
+		stack_trace("Ninja created with incorrect mind")
 
 	message_admins("[ADMIN_LOOKUPFLW(Ninja)] has been made into a ninja by dynamic.")
 	log_game("[key_name(Ninja)] was spawned as a ninja by dynamic.")

code/game/gamemodes/dynamic/dynamic_storytellers.dm

@@ -57,7 +57,8 @@ Property weights are:
 							mean += 2.5
 						if(CHAOS_MAX)
 							mean += 5
-			GLOB.dynamic_curve_centre += (mean/voters)
+			if(voters)
+				GLOB.dynamic_curve_centre += (mean/voters)
 		GLOB.dynamic_forced_threat_level = forced_threat_level
 
 /datum/dynamic_storyteller/proc/get_midround_cooldown()

code/game/gamemodes/gangs/dominator.dm

@@ -13,7 +13,7 @@
 	anchored = TRUE
 	layer = HIGH_OBJ_LAYER
 	max_integrity = 300
-	integrity_failure = 100
+	integrity_failure = 0.33
 	armor = list("melee" = 20, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 10, "acid" = 70)
 	var/datum/team/gang/gang
 	var/operating = FALSE	//false=standby or broken, true=takeover

code/game/gamemodes/gangs/gang_items.dm

@@ -220,11 +220,11 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
 	cost = 15
 	item_path = /obj/item/ammo_box/magazine/sniper_rounds
 
-/datum/gang_item/weapon/ammo/sleeper_ammo
+/*/datum/gang_item/weapon/ammo/sleeper_ammo	//no. absolutely no.
 	name = "Illicit Soporific Cartridges"
 	id = "sniper_ammo"
-	cost = 15
-	item_path = /obj/item/ammo_box/magazine/sniper_rounds/soporific
+	cost = 15	//who the fuck thought a ONE-HIT K.O. for 15 gbp IN AN ENVIRONMENT WHERE WE'RE GETTING RID OF HARDSTUNS is a GOOD IDEA
+	item_path = /obj/item/ammo_box/magazine/sniper_rounds/soporific*/
 
 /datum/gang_item/weapon/machinegun
 	name = "Mounted Machine Gun"

code/game/gamemodes/gangs/gang_pen.dm

@@ -54,6 +54,6 @@
 		return
 	var/mob/living/carbon/human/H = gangster_mind.current // we are sure the dude's human cause it's checked in attack()
 	H.silent = max(H.silent, 5)
-	H.Knockdown(100)
+	H.DefaultCombatKnockdown(100)
 	gangster_mind.add_antag_datum(/datum/antagonist/gang, gang)
 	return TRUE

code/game/gamemodes/objective.dm

@@ -86,8 +86,10 @@ GLOBAL_LIST_EMPTY(objectives)
 		if(M)
 			. += M
 
-/datum/objective/proc/find_target()
+/datum/objective/proc/find_target(dupe_search_range, blacklist)
 	var/list/datum/mind/owners = get_owners()
+	if(!dupe_search_range)
+		dupe_search_range = get_owners()
 	var/list/possible_targets = list()
 	var/try_target_late_joiners = FALSE
 	for(var/I in owners)
@@ -96,7 +98,8 @@ GLOBAL_LIST_EMPTY(objectives)
 			try_target_late_joiners = TRUE
 	for(var/datum/mind/possible_target in get_crewmember_minds())
 		if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target))
-			possible_targets += possible_target
+			if(!(possible_target in blacklist))
+				possible_targets += possible_target
 	if(try_target_late_joiners)
 		var/list/all_possible_targets = possible_targets.Copy()
 		for(var/I in all_possible_targets)
@@ -314,9 +317,11 @@ GLOBAL_LIST_EMPTY(objectives)
 
 /datum/objective/hijack
 	name = "hijack"
-	explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody."
-	team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind."
+	explanation_text = "Hijack the emergency shuttle by hacking its navigational protocols through the control console (alt click emergency shuttle console)."
+	team_explanation_text = "Hijack the emergency shuttle by hacking its navigational protocols through the control console (alt click emergency shuttle console). Leave no team member behind."
 	martyr_compatible = 0 //Technically you won't get both anyway.
+	/// Overrides the hijack speed of any antagonist datum it is on ONLY, no other datums are impacted.
+	var/hijack_speed_override = 1
 
 /datum/objective/hijack/check_completion() // Requires all owners to escape.
 	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
@@ -1073,7 +1078,7 @@ GLOBAL_LIST_EMPTY(cult_contraband)
 		var/mob/living/carbon/human/H = owner
 		H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK))
 		hoarded_item = I
-	
+
 
 
 GLOBAL_LIST_EMPTY(possible_sabotages)
@@ -1090,13 +1095,13 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
 	if(!GLOB.possible_sabotages.len)//Only need to fill the list when it's needed.
 		for(var/I in subtypesof(/datum/sabotage_objective))
 			new I
-			
+
 /datum/objective/sabotage/find_target()
 	var/list/datum/mind/owners = get_owners()
 	var/approved_targets = list()
 	check_sabotages:
 		for(var/datum/sabotage_objective/possible_sabotage in GLOB.possible_sabotages)
-			if(!is_unique_objective(possible_sabotage.sabotage_type) || possible_sabotage.check_conditions())
+			if(!is_unique_objective(possible_sabotage.sabotage_type) || possible_sabotage.check_conditions() || !possible_sabotage.can_run())
 				continue
 			for(var/datum/mind/M in owners)
 				if(M.current.mind.assigned_role in possible_sabotage.excludefromjob)
@@ -1153,3 +1158,21 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
 
 /datum/objective/flavor/wizard
 	flavor_file = "strings/flavor_objectives/wizard.txt"
+
+/datum/objective/contract
+	var/payout = 0
+	var/payout_bonus = 0
+	var/area/dropoff = null
+
+/datum/objective/contract/proc/generate_dropoff()	// Generate a random valid area on the station that the dropoff will happen.
+	var/found = FALSE
+	while(!found)
+		var/area/dropoff_area = pick(GLOB.sortedAreas)
+		if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !istype(dropoff_area, /area/shuttle/))
+			dropoff = dropoff_area
+			found = TRUE
+
+/datum/objective/contract/proc/dropoff_check(mob/user, mob/target)	// Check if both the contractor and contract target are at the dropoff point.
+	var/area/user_area = get_area(user)
+	var/area/target_area = get_area(target)
+	return (istype(user_area, dropoff) && istype(target_area, dropoff))

code/game/gamemodes/objective_sabotage.dm

@@ -12,6 +12,9 @@
 /datum/sabotage_objective/proc/check_conditions()
 	return TRUE
 
+/datum/sabotage_objective/proc/can_run()
+	return TRUE
+
 /datum/sabotage_objective/processing
 	var/won = FALSE
 
@@ -20,20 +23,20 @@
 	START_PROCESSING(SSprocessing, src)
 
 /datum/sabotage_objective/processing/proc/check_condition_processing()
-	return 100
+	return 1
 
 /datum/sabotage_objective/processing/process()
 	check_condition_processing()
-	if(won >= 100)
+	if(won >= 1)
 		STOP_PROCESSING(SSprocessing,src)
 
 /datum/sabotage_objective/processing/check_conditions()
 	return won
 
 /datum/sabotage_objective/processing/power_sink
-	name = "Drain at least 1 gigajoule of power using a power sink."
+	name = "Drain at least 100 megajoules of power using a power sink."
 	sabotage_type = "powersink"
-	special_equipment = list(/obj/item/powersink)
+	special_equipment = list(/obj/item/sbeacondrop/powersink)
 	var/sink_found = FALSE
 	var/count = 0
 
@@ -44,7 +47,7 @@
 		for(var/datum/powernet/PN in GLOB.powernets)
 			for(var/obj/item/powersink/sink in PN.nodes)
 				sink_found_this_time = TRUE
-				won = max(won,sink.power_drained/1e9)
+				won = max(won,sink.power_drained/1e8)
 		sink_found = sink_found_this_time
 		count = 0
 	return FALSE
@@ -79,6 +82,9 @@
 		won = max(1-((S.get_integrity()-50)/50),won)
 	return FALSE
 
+/datum/sabotage_objective/processing/supermatter/can_run()
+	return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines)
+
 /datum/sabotage_objective/station_integrity
 	name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal."
 	sabotage_type = "integrity"