revision II

BeeStation · Nov 7, 2023 · 6c1a4ed · 6c1a4ed
1 parent 917ab9d
commit 6c1a4ed
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 89 deletions.
diff --git a/_maps/map_files/Galactica/Galactica2.dmm b/_maps/map_files/Galactica/Galactica2.dmm
diff --git a/code/controllers/subsystem/explosion.dm b/code/controllers/subsystem/explosion.dm
@@ -415,6 +415,8 @@ SUBSYSTEM_DEF(explosions)
 			var/turf/T = locate(epicenter.x, epicenter.y, affecting_z)
 			if(!T)
 				continue
+			if(devastation_range - z_reduction <= 0 && heavy_impact_range - z_reduction <= 0 && light_impact_range - z_reduction <= 0) //NSV13 - explosions still relaying with 0-0-0 can cause REALLY weird behavior.
+				continue
 			SSexplosions.explode(T,
 				max(devastation_range - z_reduction, 0),
 				max(heavy_impact_range - z_reduction, 0),

diff --git a/nsv13.dme b/nsv13.dme
@@ -3845,8 +3845,8 @@
 #include "nsv13\code\modules\antagonists\boarders\boarders.dm"
 #include "nsv13\code\modules\antagonists\boarders\pirate_boarders.dm"
 #include "nsv13\code\modules\atmospherics\gasmixtures\reactions.dm"
-#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
 #include "nsv13\code\modules\atmospherics\machinery\components\binary_devices\constrictor.dm"
+#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
 #include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
 #include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm"
 #include "nsv13\code\modules\cargo\mission_rewards.dm"

diff --git a/nsv13/code/__DEFINES/overmap.dm b/nsv13/code/__DEFINES/overmap.dm
@@ -117,4 +117,5 @@ GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace
 //Fun tools
 #define SHIELD_NOEFFECT 0 //!Shield failed to absorb hit.
 #define SHIELD_ABSORB 1 //!Shield absorbed hit.
-#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile.
+#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile with slightly turned vector.
+#define SHIELD_FORCE_REFLECT 3 //!Shield absorbed hit and is redirecting projectile in reverse direction.