Fix merge conflict

code/modules/events/anomaly_bluespace.dm

@@ -59,7 +59,7 @@
 								blueeffect.icon = 'icons/effects/effects.dmi'
 								blueeffect.icon_state = "shieldsparkles"
 								blueeffect.layer = 17
-								blueeffect.mouse_opacity = 0
+								blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 								M.client.screen += blueeffect
 								sleep(20)
 								M.client.screen -= blueeffect

code/modules/events/blob.dm

@@ -1,7 +1,6 @@
 /datum/event/blob
-	announceWhen	= 60
-	endWhen			= 120
-	var/obj/structure/blob/core/Blob
+	announceWhen	= 120
+	endWhen			= 180
 
 /datum/event/blob/announce()
 	event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
@@ -11,18 +10,17 @@
 	if(!T)
 		return kill()
 	var/list/candidates = pollCandidates("Do you want to play as a blob?", ROLE_BLOB, 1)
-	var/mob/C
-	if(candidates.len)
-		C = pick(candidates)
-		Blob = new /obj/structure/blob/core(T, new_overmind=C.client)
-		for(var/i in 1 to 5)
-			Blob.process()
-	else
+	if(!candidates.len)
 		return kill()
-
-/datum/event/blob/tick()
-	if(!Blob)
-		kill()
-		return
-	if(IsMultiple(activeFor, 3))
-		Blob.process()
+	var/list/vents = list()
+	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in all_vent_pumps)
+		if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
+			if(temp_vent.parent.other_atmosmch.len > 50)
+				vents += temp_vent
+	var/obj/vent = pick(vents)
+	var/mob/living/simple_animal/mouse/blobinfected/B = new(vent.loc)
+	var/mob/M = pick(candidates)
+	B.key = M.key
+	to_chat(B, "<span class='userdanger'>You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.</span>")
+	var/image/alert_overlay = image('icons/mob/blob.dmi', "blank_blob")
+	notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, alert_overlay = alert_overlay)

code/modules/events/money_hacker.dm

@@ -1,3 +1,6 @@
+#define MINIMUM_PERCENTAGE_LOSS 0.5
+#define VARIABLE_LOSS 2 // Invariant: 1 - VARIABLE_LOSS/10 >= MINIMUM_PERCENTAGE_LOSS
+
 /var/global/account_hack_attempted = 0
 
 /datum/event/money_hacker
@@ -16,7 +19,7 @@
 
 /datum/event/money_hacker/announce()
 	var/message = "A brute force hack has been detected (in progress since [station_time_timestamp()]). The target of the attack is: Financial account #[affected_account.account_number], \
-	without intervention this attack will succeed in approximately 10 minutes. Required intervention: temporary suspension of affected accounts until the attack has ceased. \
+	without intervention this attack will succeed in approximately 10 minutes. Required intervention: temporary suspension of affected account until the attack has ceased. \
 	Notifications will be sent as updates occur.<br>"
 	var/my_department = "[station_name()] firewall subroutines"
 
@@ -32,35 +35,38 @@
 
 /datum/event/money_hacker/end()
 	var/message
-	if(affected_account && !affected_account)
-		//hacker wins
+	if(!isnull(affected_account) && !affected_account.suspended)
 		message = "The hack attempt has succeeded."
 
-		//subtract the money
-		var/lost = affected_account.money * 0.8 + (rand(2,4) - 2) / 10
-		affected_account.money -= lost
+		var/lost = affected_account.money * (MINIMUM_PERCENTAGE_LOSS + rand(0,VARIABLE_LOSS) / 10);
+
+		affected_account.phantom_charge(lost)
+
 
 		//create a taunting log entry
-		var/datum/transaction/T = new()
-		T.target_name = pick("","yo brotha from anotha motha","el Presidente","chieF smackDowN")
-		T.purpose = pick("Ne$ ---ount fu%ds init*&lisat@*n","PAY BACK YOUR MUM","Funds withdrawal","pWnAgE","l33t hax","liberationez")
-		T.amount = pick("","([rand(0,99999)])","alla money","9001$","HOLLA HOLLA GET DOLLA","([lost])")
+		var/dest_name = pick("","yo brotha from anotha motha","el Presidente","chieF smackDowN")
+		var/amount = pick("","([rand(0,99999)])","alla money","9001$","HOLLA HOLLA GET DOLLA","([lost])")
+		var/purpose = pick("Ne$ ---ount fu%ds init*&lisat@*n","PAY BACK YOUR MUM","Funds withdrawal","pWnAgE","l33t hax","liberationez")
 		var/date1 = "31 December, 1999"
 		var/date2 = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [rand(1000,3000)]"
-		T.date = pick("", current_date_string, date1, date2)
+		var/date = pick("", current_date_string, date1, date2)
 		var/time1 = rand(0, 99999999)
 		var/time2 = "[round(time1 / 36000)+12]:[(time1 / 600 % 60) < 10 ? add_zero(time1 / 600 % 60, 1) : time1 / 600 % 60]"
-		T.time = pick("", station_time_timestamp(), time2)
-		T.source_terminal = pick("","[pick("Biesel","New Gibson")] GalaxyNet Terminal #[rand(111,999)]","your mums place","nantrasen high CommanD")
+		var/time = pick("", station_time_timestamp(), time2)
+		var/source_terminal = pick("","[pick("Biesel","New Gibson")] GalaxyNet Terminal #[rand(111,999)]","your mums place","nantrasen high CommanD")
+
+		affected_account.makeTransactionLog(amount, purpose, source_terminal, dest_name, TRUE, date, time)
 
-		affected_account.transaction_log.Add(T)
 
 	else
 		//crew wins
-		message = "The attack has ceased, the affected accounts can now be brought online."
+		message = "The attack has ceased, the affected account can now be brought online."
 
 	var/my_department = "[station_name()] firewall subroutines"
 
 	for(var/obj/machinery/message_server/MS in world)
 		if(!MS.active) continue
 		MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2)
+
+#undef MINIMUM_PERCENTAGE_LOSS
+#undef VARIABLE_LOSS

code/modules/events/money_lotto.dm

@@ -8,19 +8,9 @@
 	if(all_money_accounts.len)
 		var/datum/money_account/D = pick(all_money_accounts)
 		winner_name = D.owner_name
-		if(!D.suspended)
-			D.money += winner_sum
 
-			var/datum/transaction/T = new()
-			T.target_name = "Nyx Daily Grand Slam -Stellar- Lottery"
-			T.purpose = "Winner!"
-			T.amount = winner_sum
-			T.date = current_date_string
-			T.time = worldtime2text()
-			T.source_terminal = "Biesel TCD Terminal #[rand(111,333)]"
-			D.transaction_log.Add(T)
-
-			deposit_success = 1
+		D.credit(winner_sum, "Winner!", "Biesel TCD Terminal #[rand(111,333)]", "Nyx Daily Grand Slam -Stellar- Lottery")
+		deposit_success = 1
 
 /datum/event/money_lotto/announce()
 	var/datum/feed_message/newMsg = new /datum/feed_message

code/modules/events/sentience.dm

@@ -13,12 +13,12 @@
 		if(!(L in player_list) && !L.mind && (L.sentience_type == sentience_type))
 			potential += L
 
+	if(!candidates.len || !potential.len) //if there are no players or simple animals to choose from, then end
+		return FALSE
+
 	var/mob/living/simple_animal/SA = pick(potential)
 	var/mob/SG = pick(candidates)
 
-	if(!SA || !SG) //if you can't find either a simple animal or a player, end
-		return FALSE
-
 	var/sentience_report = "<font size=3><b>[command_name()] Medium-Priority Update</b></font>"
 
 	var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED\]", "Steve")

code/modules/events/spacevine.dm

@@ -411,7 +411,7 @@
 	anchored = TRUE
 	density = FALSE
 	layer = SPACEVINE_LAYER
-	mouse_opacity = 2 //Clicking anywhere on the turf is good enough
+	mouse_opacity = MOUSE_OPACITY_OPAQUE //Clicking anywhere on the turf is good enough
 	pass_flags = PASSTABLE | PASSGRILLE
 	max_integrity = 50
 	var/energy = 0

code/modules/events/traders.dm

@@ -65,7 +65,7 @@ var/global/list/unused_trade_stations = list("sol")
 /datum/event/traders/proc/greet_trader(var/mob/living/carbon/human/M)
 	to_chat(M, "<span class='boldnotice'>You are a trader!</span>")
 	to_chat(M, "<span class='notice'>You are currently docked at [get_area(M)].</span>")
-	to_chat(M, "<span class='notice'>You are about to trade with NSS Cyberiad.</span>")
+	to_chat(M, "<span class='notice'>You are about to trade with [station_name()].</span>")
 	to_chat(M, "<span class='notice'>Negotiate an agreement, and request docking.</span>")
 	spawn(25)
 		show_objectives(M.mind)