Outpost security: wanted stars, arrests, massacre recovery

code/__DEFINES/explosions.dm

@@ -19,17 +19,15 @@
 #define GIBTONITE_DETONATE 3
 
 /// A wrapper for [/atom/proc/ex_act] to ensure that the explosion propagation and attendant signal are always handled.
-/// VOIDCREW: recheck outpost protection when queued or direct damage is applied.
-// VOIDCREW EDIT START: Block explosions on protected trader outposts before contents and signals fire (voidcrew/modules/trade/outpost_security.dm).
+/// VOIDCREW: a trader outpost's own floors and walls never react to a blast; whatever stands on them still does.
+// VOIDCREW EDIT START: Trader outpost turfs ignore explosions, their contents do not (voidcrew/modules/trade/outpost_security.dm).
 #define EX_ACT(target, args...)\
-	if(!is_trader_outpost_protected(target)) { \
-		if(!(target.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) { \
-			target.contents_explosion(##args);\
-		};\
-		if(!(SEND_SIGNAL(target, COMSIG_ATOM_PRE_EX_ACT, ##args) & COMPONENT_CANCEL_EX_ACT)) { \
-			SEND_SIGNAL(target, COMSIG_ATOM_EX_ACT, ##args);\
-			target.ex_act(##args);\
-		} \
+	if(!(target.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) { \
+		target.contents_explosion(##args);\
+	};\
+	if(!(isturf(target) && is_trader_outpost_protected(target)) && !(SEND_SIGNAL(target, COMSIG_ATOM_PRE_EX_ACT, ##args) & COMPONENT_CANCEL_EX_ACT)) { \
+		SEND_SIGNAL(target, COMSIG_ATOM_EX_ACT, ##args);\
+		target.ex_act(##args);\
 	}
 // VOIDCREW EDIT END
 

code/controllers/subsystem/explosions.dm

@@ -299,12 +299,6 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
 	epicenter = get_turf(epicenter)
 	if(!epicenter)
 		return
-	// VOIDCREW: suppress the blast before smoke, flashes, fire, or chain reactions.
-	// VOIDCREW EDIT START: Stop protected outpost blasts before smoke, flash, ignition and damage (voidcrew/modules/trade/outpost_security.dm).
-	if(is_trader_outpost_protected(epicenter))
-		log_game("OUTPOST PROTECTION: Suppressed explosion ([devastation_range], [heavy_impact_range], [light_impact_range]) at [AREACOORD(epicenter)]. Cause: [explosion_cause]. Last fingerprints: [key_name(explosion_cause?.fingerprintslast)].")
-		return
-	// VOIDCREW EDIT END
 
 	if(isnull(flame_range))
 		flame_range = light_impact_range
@@ -398,10 +392,6 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
 	//flash mobs
 	if(flash_range)
 		for(var/mob/living/L in viewers(flash_range, epicenter))
-			// VOIDCREW EDIT START: Stop protected outpost blasts before smoke, flash, ignition and damage (voidcrew/modules/trade/outpost_security.dm).
-			if(is_trader_outpost_protected(L)) // VOIDCREW
-				continue
-			// VOIDCREW EDIT END
 			L.flash_act()
 
 	var/list/affected_turfs = prepare_explosion_turfs(max_range, epicenter, protect_epicenter, explosion_direction, explosion_arc)
@@ -412,16 +402,13 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
 	// This is gonna be an array, index'd by turfs
 	var/list/cached_exp_block = list()
 	var/list/held_throwturf = src.held_throwturf
+	// VOIDCREW EDIT ADDITION START: who the blast caught at a trader outpost (voidcrew/modules/trade/outpost_security.dm)
+	var/list/outpost_blast_victims
+	// VOIDCREW EDIT ADDITION END
 
 	//lists are guaranteed to contain at least 1 turf at this point
 	//we presuppose that we'll be iterating away from the epicenter
 	for(var/turf/explode as anything in affected_turfs)
-		// VOIDCREW: outside blasts cannot damage, ignite, or throw outpost contents.
-		// VOIDCREW EDIT START: Stop protected outpost blasts before smoke, flash, ignition and damage (voidcrew/modules/trade/outpost_security.dm).
-		if(is_trader_outpost_protected(explode))
-			cached_exp_block[explode] = INFINITY
-			continue
-		// VOIDCREW EDIT END
 		var/our_x = explode.x
 		var/our_y = explode.y
 		var/dist = CHEAP_HYPOTENUSE(our_x, our_y, x0, y0)
@@ -446,6 +433,11 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
 		else if(dist + (block * EXPLOSION_BLOCK_LIGHT) < light_impact_range)
 			severity = EXPLODE_LIGHT
 
+		// VOIDCREW EDIT ADDITION START: a blast that catches someone at a trader outpost is an attack (voidcrew/modules/trade/outpost_security.dm)
+		if(severity != EXPLODE_NONE)
+			outpost_blast_victims = note_outpost_blast_victims(explode, outpost_blast_victims)
+		// VOIDCREW EDIT ADDITION END
+
 		if(explode == epicenter) // Ensures explosives detonating from bags trigger other explosives in that bag
 			var/list/items = list()
 			for(var/atom/holder as anything in explode)
@@ -491,6 +483,11 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
 
 	explosion_index += 1
 
+	// VOIDCREW EDIT ADDITION START: the police hear of it like any other attack (voidcrew/modules/trade/outpost_security.dm)
+	if(outpost_blast_victims)
+		GLOB.outpost_pvp_enforcement.on_outpost_bombing(explosion_cause, outpost_blast_victims)
+	// VOIDCREW EDIT ADDITION END
+
 	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EXPLOSION, epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range, explosion_cause, explosion_index)
 
 // Explosion SFX defines...

tgstation.dme

@@ -6720,6 +6720,7 @@
 #include "voidcrew\_DEFINES\outpost_market_shop.dm"
 #include "voidcrew\_DEFINES\outpost_market_storage.dm"
 #include "voidcrew\_DEFINES\outpost_market_teleporter.dm"
+#include "voidcrew\_DEFINES\outpost_police.dm"
 #include "voidcrew\_DEFINES\outpost_prison_boss_moves.dm"
 #include "voidcrew\_DEFINES\outpost_prison_bounty.dm"
 #include "voidcrew\_DEFINES\outpost_prison_changeling.dm"
@@ -6735,6 +6736,7 @@
 #include "voidcrew\_DEFINES\outpost_prison_security.dm"
 #include "voidcrew\_DEFINES\outpost_prison_social.dm"
 #include "voidcrew\_DEFINES\outpost_prison_trouble.dm"
+#include "voidcrew\_DEFINES\outpost_recovery.dm"
 #include "voidcrew\_DEFINES\outpost_styles.dm"
 #include "voidcrew\_DEFINES\overmap.dm"
 #include "voidcrew\_DEFINES\overmap_zones.dm"
@@ -6747,6 +6749,8 @@
 #include "voidcrew\_DEFINES\ship_signals.dm"
 #include "voidcrew\_DEFINES\shuttles.dm"
 #include "voidcrew\_DEFINES\sound.dm"
+#include "voidcrew\_DEFINES\stealth.dm"
+#include "voidcrew\_DEFINES\stealth_hearing.dm"
 #include "voidcrew\_DEFINES\subsystems.dm"
 #include "voidcrew\_DEFINES\techweb_nodes.dm"
 #include "voidcrew\_DEFINES\trade.dm"
@@ -6927,6 +6931,7 @@
 #include "voidcrew\edits\modules\mob\living\basic\lavaland\legion\spawn_legions.dm"
 #include "voidcrew\edits\modules\mob\living\carbon\floored_fall.dm"
 #include "voidcrew\edits\modules\mob\living\carbon\inventory.dm"
+#include "voidcrew\edits\modules\mob\living\carbon\human\human_stripping.dm"
 #include "voidcrew\edits\modules\mod\modules\modules_supply.dm"
 #include "voidcrew\edits\modules\modular_computers\file_system\programs\budgetordering.dm"
 #include "voidcrew\edits\modules\power\supermatter_anomalies.dm"
@@ -7579,6 +7584,26 @@
 #include "voidcrew\modules\outfits\pirate_factions.dm"
 #include "voidcrew\modules\outfits\syndicate.dm"
 #include "voidcrew\modules\outfits\western.dm"
+#include "voidcrew\modules\outpost_police\evidence_locker.dm"
+#include "voidcrew\modules\outpost_police\police_arrest.dm"
+#include "voidcrew\modules\outpost_police\police_cell.dm"
+#include "voidcrew\modules\outpost_police\police_core.dm"
+#include "voidcrew\modules\outpost_police\police_dispatch.dm"
+#include "voidcrew\modules\outpost_police\police_force.dm"
+#include "voidcrew\modules\outpost_police\police_hud.dm"
+#include "voidcrew\modules\outpost_police\police_life.dm"
+#include "voidcrew\modules\outpost_police\police_perception.dm"
+#include "voidcrew\modules\outpost_police\police_property.dm"
+#include "voidcrew\modules\outpost_police\police_units.dm"
+#include "voidcrew\modules\outpost_police\police_wanted.dm"
+#include "voidcrew\modules\outpost_police\recovery_core.dm"
+#include "voidcrew\modules\outpost_police\recovery_crews.dm"
+#include "voidcrew\modules\outpost_police\recovery_janitor.dm"
+#include "voidcrew\modules\outpost_police\recovery_medic.dm"
+#include "voidcrew\modules\outpost_police\recovery_morgue.dm"
+#include "voidcrew\modules\outpost_police\recovery_offscreen.dm"
+#include "voidcrew\modules\outpost_police\recovery_robbery.dm"
+#include "voidcrew\modules\outpost_police\recovery_staff.dm"
 #include "voidcrew\modules\overmap\code\controllers\subsystem\overmap.dm"
 #include "voidcrew\modules\overmap\code\controllers\subsystem\shuttle.dm"
 #include "voidcrew\modules\overmap\code\controllers\subsystem\worldgen_queue.dm"
@@ -7848,6 +7873,26 @@
 #include "voidcrew\modules\shuttle\survey\survey_data_disk.dm"
 #include "voidcrew\modules\shuttle\survey\survey_designs.dm"
 #include "voidcrew\modules\slime_extract_piles\slime_extract_piles.dm"
+#include "voidcrew\modules\stealth\scav_guards.dm"
+#include "voidcrew\modules\stealth\stealth_admin.dm"
+#include "voidcrew\modules\stealth\stealth_admin_noise.dm"
+#include "voidcrew\modules\stealth\stealth_ai.dm"
+#include "voidcrew\modules\stealth\stealth_closet.dm"
+#include "voidcrew\modules\stealth\stealth_crits.dm"
+#include "voidcrew\modules\stealth\stealth_doors.dm"
+#include "voidcrew\modules\stealth\stealth_hearing.dm"
+#include "voidcrew\modules\stealth\stealth_knife.dm"
+#include "voidcrew\modules\stealth\stealth_light.dm"
+#include "voidcrew\modules\stealth\stealth_meter.dm"
+#include "voidcrew\modules\stealth\stealth_noise.dm"
+#include "voidcrew\modules\stealth\stealth_noise_sources.dm"
+#include "voidcrew\modules\stealth\stealth_patrol.dm"
+#include "voidcrew\modules\stealth\stealth_perception.dm"
+#include "voidcrew\modules\stealth\stealth_radio.dm"
+#include "voidcrew\modules\stealth\stealth_skill.dm"
+#include "voidcrew\modules\stealth\stealth_test_ruin.dm"
+#include "voidcrew\modules\stealth\stealth_turns.dm"
+#include "voidcrew\modules\stealth_police\police_stealth.dm"
 #include "voidcrew\modules\storage\cargo_shelf.dm"
 #include "voidcrew\modules\storage\smart_locker.dm"
 #include "voidcrew\modules\storage\wall_locker.dm"