diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 1eb0b53f04f..a196299fac8 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -34,7 +34,7 @@
 	handle_hud_list()
 
 	//Handle species-specific deaths.
-	species.handle_death(src)
+	species.handle_death(src, gibbed)
 	animate_tail_stop()
 
 	//Handle brain slugs.
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 4971634a146..d5daff4a226 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -269,7 +269,7 @@
 	H.mob_swap_flags = swap_flags
 	H.mob_push_flags = push_flags
 
-/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
+/datum/species/proc/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) //Handles any species-specific death events (such as dionaea nymph spawns).
 	return
 
 // Only used for alien plasma weeds atm, but could be used for Dionaea later.
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index fb3c9ec1ff1..dddf682abd9 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -224,8 +224,9 @@
 	H.gender = NEUTER
 	return ..()
 
-/datum/species/diona/handle_death(var/mob/living/carbon/human/H)
-	H.diona_split_into_nymphs(0)
+/datum/species/diona/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0)
+	if (!gibbed)
+		H.diona_split_into_nymphs(0)
 
 /datum/species/machine
 	name = "Machine"
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index c6ff8709881..62d14702ba5 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -55,7 +55,7 @@
 
 	if(is_train_head() && !on)
 		return 0
-	
+
 	//space check ~no flying space trains sorry
 	if(on && istype(destination, /turf/space))
 		return 0
@@ -79,12 +79,13 @@
 		return
 	..()
 
-//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
+// Cargo trains are open topped, so you can shoot at the driver.
+// Or you can shoot at the tug itself, if you're good.
 /obj/vehicle/train/cargo/bullet_act(var/obj/item/projectile/Proj)
-	if(buckled_mob && prob(70))
+	if (buckled_mob && Proj.original == buckled_mob)
 		buckled_mob.bullet_act(Proj)
-		return
-	..()
+	else
+		..()
 
 /obj/vehicle/train/cargo/update_icon()
 	if(open)
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 556e82cd0c8..75b1328ef59 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -117,6 +117,10 @@
 	if (Proj.damage_type == BRUTE || Proj.damage_type == BURN)
 		health -= Proj.damage
 	..()
+
+	if (prob(20))
+		PoolOrNew(/obj/effect/effect/sparks, loc)
+
 	healthcheck()
 
 /obj/vehicle/meteorhit()
diff --git a/html/Skull132_Age_Restrictions.yml b/html/changelogs/skull132-tugs_and_diona.yml
similarity index 64%
rename from html/Skull132_Age_Restrictions.yml
rename to html/changelogs/skull132-tugs_and_diona.yml
index f33295eeedc..a6a2b32f4dc 100644
--- a/html/Skull132_Age_Restrictions.yml
+++ b/html/changelogs/skull132-tugs_and_diona.yml
@@ -9,5 +9,5 @@ delete-after: True
 # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
 # Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
 changes:
-  - rscadd: "Age restrictions for all jobs and antags are now implemented again with config options."
-  - tweak: "You are now prompted to confirm whether or not you want to delete a character."
+  - tweak: "You can now shoot at cargo trains, or their passangers specifically. If you click on the train, you will hit it, and thus can destroy it while the passanger is still onboard."
+  - tweak: "Gibbing or husking a Diona will no longer have them split off into nymphs. A gibbed or husked Diona is now permadead."