module things, jfc

code/modules/events/holiday/vday.dm

@@ -88,7 +88,7 @@
 	               "The virologist is rogue, and the only cure is a kiss from you.",
 	               "Would you spend some time in my upgraded sleeper?",
 	               "You must be a silicon, because you've unbolted my heart.",
-	               "Are you Nar-Sie? Because there's nar-one else I sie.",
+	               "Are you Nar'Sie? Because there's nar-one else I sie.",
 	               "If you were a taser, you'd be set to stunning.",
 	               "Do you have stamina damage from running through my dreams?",
 	               "If I were an alien, would you let me hug you?",
@@ -160,7 +160,7 @@
                 "A heart-shaped candy that reads: ERP",
                 "A heart-shaped candy that reads: LEWD",
                 "A heart-shaped candy that reads: LUSTY",
-                "A heart-shaped candy that reads: SPESS LOVE"
+                "A heart-shaped candy that reads: SPESS LOVE",
                 "A heart-shaped candy that reads: AYY LMAO",
                 "A heart-shaped candy that reads: TABLE ME",
                 "A heart-shaped candy that reads: HAND CUFFS",

code/modules/events/immovable_rod.dm

@@ -105,7 +105,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 /obj/effect/immovablerod/singularity_pull()
 	return
 
-/obj/effect/immovablerod/Collide(atom/clong)
+/obj/effect/immovablerod/Bump(atom/clong)
 	if(prob(10))
 		playsound(src, 'sound/effects/bang.ogg', 50, 1)
 		audible_message("<span class='danger'>You hear a CLANG!</span>")

code/modules/events/pirates.dm

@@ -1,5 +1,3 @@
-#define LOOT_LOCATOR_COOLDOWN 150
-
 /datum/round_event_control/pirates
 	name = "Space Pirates"
 	typepath = /datum/round_event/pirates
@@ -26,10 +24,9 @@
 /datum/round_event/pirates/setup()
 	ship_name = pick(strings(PIRATE_NAMES_FILE, "ship_names"))
 
-/datum/round_event/pirates/announce()
+/datum/round_event/pirates/announce(fake)
 	priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
-	
-	if(!control) //Means this is false alarm, todo : explicit checks instead of using announceWhen
+	if(fake)
 		return
 	threat = new
 	payoff = round(SSshuttle.points * 0.80)
@@ -47,7 +44,7 @@
 			paid_off = TRUE
 			return
 		else
-			priority_announce("Trying to cheat us ? You'll regret this!",sender_override = ship_name)
+			priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
 	if(!shuttle_spawned)
 		spawn_shuttle()
 
@@ -60,7 +57,7 @@
 /datum/round_event/pirates/proc/spawn_shuttle()
 	shuttle_spawned = TRUE
 
-	var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew ?", ROLE_TRAITOR)
+	var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
 	shuffle_inplace(candidates)
 
 	var/datum/map_template/shuttle/pirate/default/ship = new
@@ -120,12 +117,12 @@
 	gps.tracking = TRUE
 	active = TRUE
 	to_chat(user,"<span class='notice'>You toggle [src] [active ? "on":"off"].</span>")
-	to_chat(user,"<span class='warning'>The scrambling signal can be now tracked by gps.</span>")
+	to_chat(user,"<span class='warning'>The scrambling signal can be now tracked by GPS.</span>")
 	START_PROCESSING(SSobj,src)
 
 /obj/machinery/shuttle_scrambler/interact(mob/user)
 	if(!active)
-		if(alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it ?", "Scrambler", "Yes", "Cancel") == "Cancel")
+		if(alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it?", "Scrambler", "Yes", "Cancel") == "Cancel")
 			return
 		if(active || !user.canUseTopic(src))
 			return
@@ -227,43 +224,234 @@
 	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/tank/internals/oxygen
 
+
 /obj/machinery/loot_locator
 	name = "Booty Locator"
 	desc = "This sophisticated machine scans the nearby space for items of value."
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "tdoppler"
 	density = TRUE
-	var/cooldown = 0
-	var/result_count = 3 //Show X results.
-
-/obj/machinery/proc/display_current_value()
-	var/area/current = get_area(src)
-	var/value = 0
-	for(var/turf/T in current.contents)
-		value += export_item_and_contents(T,TRUE, TRUE, dry_run = TRUE)
-	say("Current vault value : [value] credits.")
+	var/cooldown = 300
+	var/next_use = 0
 
 /obj/machinery/loot_locator/interact(mob/user)
-	if(world.time <= cooldown)
+	if(world.time <= next_use)
 		to_chat(user,"<span class='warning'>[src] is recharging.</span>")
 		return
-	cooldown = world.time + LOOT_LOCATOR_COOLDOWN
-	display_current_value()
-	var/list/results = list()
-	for(var/atom/movable/AM in world)
-		if(is_type_in_typecache(AM,GLOB.pirate_loot_cache))
-			if(is_station_level(AM.z))
-				if(get_area(AM) == get_area(src)) //Should this be variable ?
-					continue
-				results += AM
-		CHECK_TICK
-	if(!results.len)
+	next_use = world.time + cooldown
+	var/atom/movable/AM = find_random_loot()
+	if(!AM)
 		say("No valuables located. Try again later.")
 	else
-		for(var/i in 1 to result_count)
-			if(!results.len)
-				return
-			var/atom/movable/AM = pick_n_take(results)
-			say("Located: [AM.name] at [get_area_name(AM)]")
+		say("Located: [AM.name] at [get_area_name(AM)]")
 
-#undef LOOT_LOCATOR_COOLDOWN
+/obj/machinery/loot_locator/proc/find_random_loot()
+	if(!GLOB.exports_list.len)
+		setupExports()
+	var/list/possible_loot = list()
+	for(var/datum/export/pirate/E in GLOB.exports_list)
+		possible_loot += E
+	var/datum/export/pirate/P
+	var/atom/movable/AM
+	while(!AM && possible_loot.len)
+		P = pick_n_take(possible_loot)
+		AM = P.find_loot()
+	return AM
+
+//Pad & Pad Terminal
+/obj/machinery/piratepad
+	name = "cargo hold pad"
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "lpad-idle-o"
+	var/idle_state = "lpad-idle-o"
+	var/warmup_state = "lpad-idle"
+	var/sending_state = "lpad-beam"
+	var/cargo_hold_id
+
+/obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I)
+	if (istype(I))
+		to_chat(user, "<span class='notice'>You register [src] in [I]s buffer.</span>")
+		I.buffer = src
+		return TRUE
+
+/obj/machinery/computer/piratepad_control
+	name = "cargo hold control terminal"
+	var/status_report = "Idle"
+	var/obj/machinery/piratepad/pad
+	var/warmup_time = 100
+	var/sending = FALSE
+	var/points = 0
+	var/datum/export_report/total_report
+	var/sending_timer
+	var/cargo_hold_id
+
+/obj/machinery/computer/piratepad_control/Initialize()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
+	if (istype(I) && istype(I.buffer,/obj/machinery/piratepad))
+		to_chat(user, "<span class='notice'>You link [src] with [I.buffer] in [I] buffer.</span>")
+		pad = I.buffer
+		updateDialog()
+		return TRUE
+
+/obj/machinery/computer/piratepad_control/LateInitialize()
+	. = ..()
+	if(cargo_hold_id)
+		for(var/obj/machinery/piratepad/P in GLOB.machines)
+			if(P.cargo_hold_id == cargo_hold_id)
+				pad = P
+				return
+	else
+		pad = locate() in range(4,src)
+
+/obj/machinery/computer/piratepad_control/ui_interact(mob/user)
+	. = ..()
+	var/list/t = list()
+	t += "<div class='statusDisplay'>Cargo Hold Control<br>"
+	t += "Current cargo value : [points]"
+	t += "</div>"
+	if(!pad)
+		t += "<div class='statusDisplay'>No pad located.</div><BR>"
+	else
+		t += "<br>[status_report]<br>"
+		if(!sending)
+			t += "<a href='?src=[REF(src)];recalc=1;'>Recalculate Value</a><a href='?src=[REF(src)];send=1'>Send</a>"
+		else
+			t += "<a href='?src=[REF(src)];stop=1'>Stop sending</a>"
+
+	var/datum/browser/popup = new(user, "piratepad", name, 300, 500)
+	popup.set_content(t.Join())
+	popup.open()
+
+/obj/machinery/computer/piratepad_control/proc/recalc()
+	if(sending)
+		return
+	status_report = "Predicted value:<br>"
+	var/datum/export_report/ex = new
+	for(var/atom/movable/AM in get_turf(pad))
+		if(AM == pad)
+			continue
+		export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, dry_run = TRUE, external_report = ex)
+
+	for(var/datum/export/E in ex.total_amount)
+		status_report += E.total_printout(ex,notes = FALSE) + "<br>"
+
+/obj/machinery/computer/piratepad_control/proc/send()
+	if(!sending)
+		return
+
+	var/datum/export_report/ex = new
+
+	for(var/atom/movable/AM in get_turf(pad))
+		if(AM == pad)
+			continue
+		export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, delete_unsold = FALSE, external_report = ex)
+
+	status_report = "Sold:<br>"
+	var/value = 0
+	for(var/datum/export/E in ex.total_amount)
+		var/export_text = E.total_printout(ex,notes = FALSE) //Don't want nanotrasen messages, makes no sense here.
+		if(!export_text)
+			continue
+
+		status_report += export_text + "<br>"
+		value += ex.total_value[E]
+
+	if(!total_report)
+		total_report = ex
+	else
+		total_report.exported_atoms += ex.exported_atoms
+		for(var/datum/export/E in ex.total_amount)
+			total_report.total_amount[E] += ex.total_amount[E]
+			total_report.total_value[E] += ex.total_value[E]
+
+	points += value
+
+	pad.visible_message("<span class='notice'>[pad] activates!</span>")
+	flick(pad.sending_state,pad)
+	pad.icon_state = pad.idle_state
+	sending = FALSE
+	updateDialog()
+
+/obj/machinery/computer/piratepad_control/proc/start_sending()
+	if(sending)
+		return
+	sending = TRUE
+	status_report = "Sending..."
+	pad.visible_message("<span class='notice'>[pad] starts charging up.</span>")
+	pad.icon_state = pad.warmup_state
+	sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE)
+
+/obj/machinery/computer/piratepad_control/proc/stop_sending()
+	if(!sending)
+		return
+	sending = FALSE
+	status_report = "Idle"
+	pad.icon_state = pad.idle_state
+	deltimer(sending_timer)
+
+/obj/machinery/computer/piratepad_control/Topic(href, href_list)
+	if(..())
+		return
+	if(pad)
+		if(href_list["recalc"])
+			recalc()
+		if(href_list["send"])
+			start_sending()
+		if(href_list["stop"])
+			stop_sending()
+		updateDialog()
+	else
+		updateDialog()
+
+/datum/export/pirate
+	export_category = EXPORT_PIRATE
+
+//Attempts to find the thing on station
+/datum/export/pirate/proc/find_loot()
+	return
+
+/datum/export/pirate/ransom
+	cost = 3000
+	unit_name = "hostage"
+	export_types = list(/mob/living/carbon/human)
+
+/datum/export/pirate/ransom/find_loot()
+	var/list/head_minds = SSjob.get_living_heads()
+	var/list/head_mobs = list()
+	for(var/datum/mind/M in head_minds)
+		head_mobs += M.current
+	if(head_mobs.len)
+		return pick(head_mobs)
+
+/datum/export/pirate/ransom/get_cost(atom/movable/AM)
+	var/mob/living/carbon/human/H = AM
+	if(H.stat != CONSCIOUS || !H.mind || !H.mind.assigned_role) //mint condition only
+		return 0
+	else
+		if(H.mind.assigned_role in GLOB.command_positions)
+			return 3000
+		else
+			return 1000
+
+/datum/export/pirate/parrot
+	cost = 2000
+	unit_name = "alive parrot"
+	export_types = list(/mob/living/simple_animal/parrot)
+
+/datum/export/pirate/parrot/find_loot()
+	for(var/mob/living/simple_animal/parrot/P in GLOB.alive_mob_list)
+		var/turf/T = get_turf(P)
+		if(T && is_station_level(T.z))
+			return P
+
+/datum/export/pirate/cash
+	cost = 1
+	unit_name = "bills"
+	export_types = list(/obj/item/stack/spacecash)
+
+/datum/export/pirate/cash/get_amount(obj/O)
+	var/obj/item/stack/spacecash/C = O
+	return ..() * C.amount * C.value

code/modules/events/shuttle_loan.dm

@@ -4,6 +4,8 @@
 #define DEPARTMENT_RESUPPLY 4
 #define ANTIDOTE_NEEDED 5
 #define PIZZA_DELIVERY 6
+#define ITS_HIP_TO 7
+#define MY_GOD_JC 8
 
 
 /datum/round_event_control/shuttle_loan
@@ -21,7 +23,7 @@
 	var/thanks_msg = "The cargo shuttle should return in five minutes. Have some supply points for your trouble."
 
 /datum/round_event/shuttle_loan/setup()
-	dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY)
+	dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC)
 
 /datum/round_event/shuttle_loan/announce(fake)
 	SSshuttle.shuttle_loan = src
@@ -70,8 +72,6 @@
 						P.name = "Cargo Report"
 						P.info = "Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?"
 						P.update_icon()
-			thanks_msg = "The cargo shuttle should return in 5 minutes."
-			bonus_points = 0
 		if(ANTIDOTE_NEEDED)
 			if(prob(50))
 				priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "CentCom Research Initiatives")
@@ -94,6 +94,30 @@
 						P.name = "Cargo Report"
 						P.info = "Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead."
 						P.update_icon()
+		if(ITS_HIP_TO)
+			if(prob(50))
+				priority_announce("Cargo: One of our freighters carrying a bee shipment has been attacked by eco-terrorists. Can you clean up the mess for us?", "CentCom Janitorial Division")
+			else
+				priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
+				for(var/obj/machinery/computer/communications/C in GLOB.machines)
+					if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
+						var/obj/item/paper/P = new(C.loc)
+						P.name = "Cargo Report"
+						P.info = "Cargo: One of our freighters carrying a bee shipment has been attacked by eco-terrorists. Can you clean up the mess for us?."
+						P.update_icon()
+			bonus_points = 20000 //Toxin bees can be unbeelievably lethal
+		if(MY_GOD_JC)
+			if(prob(50))
+				priority_announce("Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it.", "CentCom Security Division")
+			else
+				priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
+				for(var/obj/machinery/computer/communications/C in GLOB.machines)
+					if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
+						var/obj/item/paper/P = new(C.loc)
+						P.name = "Cargo Report"
+						P.info = "Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it."
+						P.update_icon()
+			bonus_points = 45000 //If you mess up, people die and the shuttle gets turned into swiss cheese
 
 /datum/round_event/shuttle_loan/proc/loan_shuttle()
 	priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.")
@@ -119,6 +143,10 @@
 			SSshuttle.centcom_message += "Virus samples incoming."
 		if(PIZZA_DELIVERY)
 			SSshuttle.centcom_message += "Pizza delivery for [station_name()]"
+		if(ITS_HIP_TO)
+			SSshuttle.centcom_message += "Biohazard cleanup incoming."
+		if(MY_GOD_JC)
+			SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution."
 
 /datum/round_event/shuttle_loan/tick()
 	if(dispatched)
@@ -149,12 +177,12 @@
 				var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops]
 				pack.generate(pick_n_take(empty_shuttle_turfs))
 
-				shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
-				shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
+				shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator)
+				shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator)
 				if(prob(75))
-					shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
+					shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator)
 				if(prob(50))
-					shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
+					shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator)
 
 			if(RUSKY_PARTY)
 				var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/service/party]
@@ -224,15 +252,44 @@
 					var/decal = pick(/obj/effect/decal/cleanable/flour, /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/oil)
 					new decal(pick_n_take(empty_shuttle_turfs))
 			if(PIZZA_DELIVERY)
-				shuttle_spawns.Add(/obj/item/pizzabox/margherita)
-				shuttle_spawns.Add(/obj/item/pizzabox/margherita)
-				shuttle_spawns.Add(/obj/item/pizzabox/meat)
-				shuttle_spawns.Add(/obj/item/pizzabox/meat)
-				shuttle_spawns.Add(/obj/item/pizzabox/vegetable)
-				if(prob(10))
-					shuttle_spawns.Add(/obj/item/pizzabox/bomb)
+				var/naughtypizza = list(/obj/item/pizzabox/bomb,/obj/item/pizzabox/margherita/robo) //oh look another blaklist, for pizza nonetheless!
+				var/nicepizza = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable, /obj/item/pizzabox/mushroom)
+				for(var/i in 1 to 6)
+					shuttle_spawns.Add(pick(prob(5) ? naughtypizza : nicepizza))
+			if(ITS_HIP_TO)
+				var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/organic/hydroponics/beekeeping_fullkit]
+				pack.generate(pick_n_take(empty_shuttle_turfs))
+
+				shuttle_spawns.Add(/obj/effect/mob_spawn/human/corpse/bee_terrorist)
+				shuttle_spawns.Add(/obj/effect/mob_spawn/human/corpse/cargo_tech)
+				shuttle_spawns.Add(/obj/effect/mob_spawn/human/corpse/cargo_tech)
+				shuttle_spawns.Add(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
+				shuttle_spawns.Add(/obj/item/gun/ballistic/automatic/pistol/no_mag)
+				shuttle_spawns.Add(/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag)
+				shuttle_spawns.Add(/obj/item/honey_frame)
+				shuttle_spawns.Add(/obj/item/honey_frame)
+				shuttle_spawns.Add(/obj/item/honey_frame)
+				shuttle_spawns.Add(/obj/structure/beebox/unwrenched)
+				shuttle_spawns.Add(/obj/item/queen_bee/bought)
+				shuttle_spawns.Add(/obj/structure/closet/crate/hydroponics)
+
+				for(var/i in 1 to 8)
+					shuttle_spawns.Add(/mob/living/simple_animal/hostile/poison/bees/toxin)
+
+				for(var/i in 1 to 5)
+					var/decal = pick(/obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/insectguts)
+					new decal(pick_n_take(empty_shuttle_turfs))
+
+				for(var/i in 1 to 10)
+					var/casing = /obj/item/ammo_casing/spent
+					new casing(pick_n_take(empty_shuttle_turfs))
+
+			if(MY_GOD_JC)
+				shuttle_spawns.Add(/obj/machinery/syndicatebomb/shuttle_loan)
+				if(prob(95))
+					shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb)
 				else
-					shuttle_spawns.Add(/obj/item/pizzabox/margherita)
+					shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase)
 
 		var/false_positive = 0
 		while(shuttle_spawns.len && empty_shuttle_turfs.len)
@@ -244,9 +301,36 @@
 			var/spawn_type = pick_n_take(shuttle_spawns)
 			new spawn_type(T)
 
+//items that appear only in shuttle loan events
+
+/obj/item/storage/belt/fannypack/yellow/bee_terrorist/PopulateContents()
+	new /obj/item/grenade/plastic/c4 (src)
+	new /obj/item/reagent_containers/pill/cyanide(src)
+	new /obj/item/grenade/chem_grenade/facid(src)
+
+/obj/item/paper/fluff/bee_objectives
+	name = "Objectives of a Bee Liberation Front Operative"
+	info = "<b>Objective #1</b>. Liberate all bees on the NT transport vessel 2416/B. <b>Success!</b>  <br><b>Objective #2</b>. Escape alive. <b>Failed.</b>"
+
+/obj/machinery/syndicatebomb/shuttle_loan/Initialize()
+	. = ..()
+	setAnchored(TRUE)
+	timer_set = rand(480, 600) //once the supply shuttle docks (after 5 minutes travel time), players have between 3-5 minutes to defuse the bomb
+	activate()
+	update_icon()
+
+/obj/item/paper/fluff/cargo/bomb
+	name = "hastly scribbled note"
+	info = "GOOD LUCK!"
+
+/obj/item/paper/fluff/cargo/bomb/allyourbase
+	info = "Somebody set us up the bomb!"
+
 #undef HIJACK_SYNDIE
 #undef RUSKY_PARTY
 #undef SPIDER_GIFT
 #undef DEPARTMENT_RESUPPLY
 #undef ANTIDOTE_NEEDED
 #undef PIZZA_DELIVERY
+#undef ITS_HIP_TO
+#undef MY_GOD_JC

code/modules/events/spacevine.dm

@@ -92,7 +92,7 @@
 	if(issilicon(crosser))
 		return
 	if(prob(severity) && istype(crosser) && !isvineimmune(crosser))
-		to_chat(crosser, "<span class='alert'>You accidently touch the vine and feel a strange sensation.</span>")
+		to_chat(crosser, "<span class='alert'>You accidentally touch the vine and feel a strange sensation.</span>")
 		crosser.adjustToxLoss(5)
 
 /datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater)

code/modules/events/vent_clog.dm

@@ -79,6 +79,11 @@
 	typepath = /datum/round_event/vent_clog/beer
 	max_occurrences = 0
 
+/datum/round_event_control/vent_clog/plasma_decon
+	name = "Plasma decontamination"
+	typepath = /datum/round_event/vent_clog/plasma_decon
+	max_occurrences = 0
+
 /datum/round_event/vent_clog/beer
 	reagentsAmount = 100
 
@@ -96,3 +101,14 @@
 			foam.set_up(200, get_turf(vent), R)
 			foam.start()
 		CHECK_TICK
+
+/datum/round_event/vent_clog/plasma_decon/announce()
+	priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update")
+
+/datum/round_event/vent_clog/plasma_decon/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+		if(vent && vent.loc)
+			var/datum/effect_system/smoke_spread/freezing/decon/smoke = new
+			smoke.set_up(7, get_turf(vent), 7)
+			smoke.start()
+		CHECK_TICK

code/modules/events/wizard/departmentrevolt.dm

@@ -46,8 +46,8 @@
 					if(M.assigned_role == job)
 						citizens += H
 						M.add_antag_datum(/datum/antagonist/separatist,nation)
-						H.log_message("<font color='red'>Was made into a separatist, long live [nation_name]!</font>", INDIVIDUAL_ATTACK_LOG)
-	
+						H.log_message("Was made into a separatist, long live [nation_name]!", LOG_ATTACK, color="red")
+
 	if(citizens.len)
 		var/message
 		for(var/job in jobs_to_revolt)

code/modules/events/wizard/greentext.dm

@@ -63,11 +63,11 @@
 /obj/item/greentext/proc/check_winner()
 	if(!new_holder)
 		return
-	
+
 	if(is_centcom_level(new_holder.z))//you're winner!
 		to_chat(new_holder, "<font color='green'>At last it feels like victory is assured!</font>")
 		new_holder.mind.add_antag_datum(/datum/antagonist/greentext)
-		new_holder.log_message("<font color='green'>Won with greentext!!!</font>", INDIVIDUAL_ATTACK_LOG)
+		new_holder.log_message("won with greentext!!!", LOG_ATTACK, color="green")
 		color_altered_mobs -= new_holder
 		resistance_flags |= ON_FIRE
 		qdel(src)

code/modules/events/wizard/imposter.dm

@@ -36,5 +36,5 @@
 		SSticker.mode.apprentices += I.mind
 		I.mind.special_role = "imposter"
 		//
-		I.log_message("<font color='red'>Is an imposter!</font>", INDIVIDUAL_ATTACK_LOG) //?
+		I.log_message("is an imposter!", LOG_ATTACK, color="red") //?
 		SEND_SOUND(I, sound('sound/effects/magic.ogg'))

code/modules/events/wizard/rpgloot.dm

@@ -34,6 +34,7 @@
 	var/one_use = TRUE
 
 /obj/item/upgradescroll/afterattack(obj/item/target, mob/user , proximity)
+	. = ..()
 	if(!proximity || !istype(target))
 		return