removes rest of cruft missions and reworks high priority

shiptest-ss13 · Jun 5, 2024 · e6a9c70 · e6a9c70
1 parent adc1e4a
commit e6a9c70
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 323 deletions.
diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm
@@ -0,0 +1,29 @@
+/*
+/datum/round_event_control/high_priority_mission
+	name = "High Priority Mission"
+	typepath = /datum/round_event/high_priority_mission
+	max_occurrences = 3
+	weight = 20
+	earliest_start = 0 //10 MINUTES
+
+/datum/round_event_control/high_priority_missiony/canSpawnEvent(players, allow_magic = FALSE)
+	if(!(length(SSovermap.outposts)))
+		return FALSE
+	return ..()
+
+/datum/round_event/high_priority_mission
+	var/datum/mission/priority_mission
+	var/datum/overmap/outpost/target_outpost
+
+/datum/round_event/high_priority_mission/announce()
+	priority_announce("We have issued a high-priority mission. Details have been sent to all consoles.", "[target_outpost] Mission Program", null, sender_override = "[target_outpost] Communications")
+
+/datum/round_event/high_priority_mission/setup()
+	target_outpost = pick(SSovermap.outposts)
+	priority_mission = pick(target_outpost.missions)
+
+/datum/round_event/high_priority_mission/start()
+	if(priority_mission)
+		priority_mission.name = "HIGH PRIORITY - [priority_mission.name]"
+		priority_mission.value = priority_mission.value * 3
+*/
diff --git a/code/modules/events/refactor_and_unticked/alien_infestation.dm b/code/modules/events/refactor_and_unticked/alien_infestation.dm
diff --git a/code/modules/events/refactor_and_unticked/high_priority_bounty.dm b/code/modules/events/refactor_and_unticked/high_priority_bounty.dm
diff --git a/code/modules/events/refactor_and_unticked/mass_hallucination.dm b/code/modules/events/refactor_and_unticked/mass_hallucination.dm
diff --git a/code/modules/events/refactor_and_unticked/operative.dm b/code/modules/events/refactor_and_unticked/operative.dm
diff --git a/code/modules/events/refactor_and_unticked/space_dragon.dm b/code/modules/events/refactor_and_unticked/space_dragon.dm
diff --git a/code/modules/events/refactor_and_unticked/spider_infestation.dm b/code/modules/events/refactor_and_unticked/spider_infestation.dm
diff --git a/code/modules/events/refactor_and_unticked/wormholes.dm b/code/modules/events/refactor_and_unticked/wormholes.dm
diff --git a/code/modules/events/ship/lottery.dm b/code/modules/events/ship/lottery.dm
@@ -13,13 +13,20 @@
 
 /datum/round_event/ship/lottery
 	var/creds_won = 0
+	var/datum/overmap/outpost/target_outpost
 	announceWhen = 5
 
+/datum/round_event/ship/lottery/setup()
+	if(!..())
+		return FALSE
+	target_outpost = pick(SSovermap.outposts)
+	creds_won = rand(1, 100) * 250
+
 /datum/round_event/ship/lottery/start()
 	if(!target_ship)
 		return
 	if(target_ship.ship_account)
-		creds_won = rand(1, 100) * 250
+
 		target_ship.ship_account.adjust_money(creds_won, "deposit")
 
 /datum/round_event/ship/lottery/announce(fake)
@@ -30,7 +37,7 @@
 			null,
 			null,
 			"Sweep stakes!",
-			sender_override = "Outpost Communications",
+			sender_override = "[target_outpost] Communications",
 		)
 
 
diff --git a/shiptest.dme b/shiptest.dme
@@ -2080,6 +2080,7 @@
 #include "code\modules\events\_ghost_role.dm"
 #include "code\modules\events\aurora_caelus.dm"
 #include "code\modules\events\fax_spam.dm"
+#include "code\modules\events\high_priority_bounty.dm"
 #include "code\modules\events\ion_storm.dm"
 #include "code\modules\events\salesman.dm"
 #include "code\modules\events\sentience.dm"