ParadiseSS13 · Burzah · Nov 25, 2024 · Sep 21, 2024 · Sep 21, 2024 · Sep 21, 2024
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
diff --git a/code/__DEFINES/announce_defines.dm b/code/__DEFINES/announce_defines.dm
@@ -6,3 +6,4 @@
 #define ANNOUNCE_KIND_MAJOR		"NAS Trurl Update"
 #define ANNOUNCE_KIND_EVENT		"NAS Trurl Update"  // Intentionally the same as above
 #define ANNOUNCE_KIND_AI		"A.I. Announcement"
+#define ANNOUNCE_KIND_PTL		"Power Transmission Laser report"
diff --git a/code/__DEFINES/power_defines.dm b/code/__DEFINES/power_defines.dm
@@ -46,3 +46,6 @@
 #define KJ * 1e3
 #define MJ * 1e6
 #define GJ * 1e9
+
+/// Conversion ratio from Watt over a machine process tick time to Joules
+#define WATT_TICK_TO_JOULE 2
diff --git a/code/_globalvars/lists/mob_lists.dm b/code/_globalvars/lists/mob_lists.dm
@@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(mob_living_list)			//all instances of /mob/living and subtypes
 GLOBAL_LIST_EMPTY(carbon_list)				//all instances of /mob/living/carbon and subtypes, notably does not contain simple animals
 GLOBAL_LIST_EMPTY(human_list)				//all instances of /mob/living/carbon/human and subtypes
 GLOBAL_LIST_EMPTY(alive_mob_list)			//List of all alive mobs, including clientless. Excludes /mob/new_player
+GLOBAL_LIST_EMPTY(alive_megafauna_list)     //List of all living megafauna
 GLOBAL_LIST_EMPTY(dead_mob_list)				//List of all dead mobs, including clientless. Excludes /mob/new_player
 GLOBAL_LIST_EMPTY(non_respawnable_keys)	//List of ckeys that are excluded from respawning for remainder of round.
 GLOBAL_LIST_INIT(simple_animals, list(list(), list(), list(), list()))			//One for each AI_* status define, List of all simple animals, including clientless

diff --git a/code/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm
@@ -174,3 +174,10 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum
 	log_name = ANNOUNCE_KIND_AI
 	sound = sound('sound/misc/notice2.ogg')
 	style = "major"
+
+/datum/announcement_configuration/ptl
+	default_title = ANNOUNCE_KIND_PTL
+	add_log = FALSE
+	sound = sound('sound/misc/notice2.ogg')
+	style = "major"
+
diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm
@@ -172,3 +172,5 @@
 	icon_state = "danger"
 
 /area/lavaland/surface/outdoors/explored
+
+/area/lavaland/surface/outdoors/targetable
diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm
@@ -85,6 +85,10 @@
 	name = "\improper Gravity Generator"
 	icon_state = "gravgen"
 
+/area/station/engineering/transmission_laser
+	name = "\improper Power Transmission Laser"
+	icon_state = "engi"
+
 /area/station/engineering/ai_transit_tube
 	name = "\improper AI Minisat Tranit Tube"
 	icon_state = "ai"

diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
@@ -6,8 +6,6 @@
 #define ALERT_CATEGORY_NOPOWER "pulse_nopower"
 #define ALERT_CATEGORY_NOREGEN "pulse_noregen"
 /// Conversion ratio from Watt ticks to joules.
-/// Should be a pulse demon's life tick length in seconds.
-#define WATT_TICK_TO_JOULE 2
 
 /mob/living/simple_animal/demon/pulse_demon
 	name = "pulse demon"
@@ -867,4 +865,3 @@
 #undef PULSEDEMON_PLATING_SPARK_CHANCE
 #undef PULSEDEMON_APC_CHARGE_MULTIPLIER
 #undef PULSEDEMON_SMES_DRAIN_MULTIPLIER
-#undef WATT_TICK_TO_JOULE
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -310,6 +310,7 @@
 	// No other state is happening, therefore we are stunned
 	icon_state = icon_stun
 
+
 /datum/objective/revenant
 	needs_target = FALSE
 	var/targetAmount = 100

diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
@@ -300,3 +300,4 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
 	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
 	smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS)
 	canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -172,3 +172,5 @@
		icon_state = "danger"

		/area/lavaland/surface/outdoors/explored

		/area/lavaland/surface/outdoors/targetable
Original file line number	Diff line number	Diff line change
Expand Up		@@ -300,3 +300,4 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
		smoothing_flags = SMOOTH_BITMASK \| SMOOTH_DIAGONAL_CORNERS
		smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS)
		canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)