diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm
index 5f3fe4fc784..0a8a2103649 100644
--- a/code/datums/elements/crusher_loot.dm
+++ b/code/datums/elements/crusher_loot.dm
@@ -38,7 +38,6 @@
 	// SKYRAT EDIT START - ASHWALKER TROPHIES
 	var/datum/status_effect/ashwalker_damage/ashie_damage = target.has_status_effect(/datum/status_effect/ashwalker_damage) // SKYRAT EDIT ADDITION
 	var/damage_total = damage?.total_damage + ashie_damage?.total_damage // SKYRAT EDIT ADDITION
-	if(damage_total && prob((damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. // SKYRAT EDIT - ORIGINAL: if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod))
 	// SKYRAT EDIT END - ASHWALKER TROPHIES
 	if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default.
 		if(!islist(trophy_type))
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 8697cd3e72a..13670a50e54 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -507,7 +507,7 @@
 		balloon_alert(user, "no charge!")
 		return COMPONENT_BLOCK_TRANSFORM
 
-/obj/item/melee/energy/sword/surplus/proc/do_jiggle(mob/user)
+/obj/item/melee/energy/sword/surplus/do_jiggle(mob/user) // BUBBER EDIT - MAKES THIS AN OVERRIDE BECAUSE SKYRAT HAS IT DEFINED ON /ATOM - THIS SHOULDNT CAUSE ISSUES BUT IF YOU COME LOOKING LATER THIS IS WHAT IS GOING ON
 	if(!COOLDOWN_FINISHED(src, jiggle_cooldown))
 		return TRUE
 
diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
index 2da7e46b9ff..a40ee8511e1 100644
--- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
@@ -365,7 +365,7 @@
 			continue
 		for(var/mob/living/hidden as anything in hidden_mobs)
 			///Sell mobs, but leave their contents intact.
-			export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report, export_market = export_market) // BUBBER EDIT CHANGE - ORIGINAL: export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report)
+			export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report, export_markets = list(EXPORT_MARKET_STATION, EXPORT_MARKET_PIRACY)) // BUBBER EDIT CHANGE - ORIGINAL: export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report)
 		///there are still licing mobs inside that item. Stop, don't sell it ffs.
 		if(locate(/mob/living) in item_on_pad.get_all_contents())
 			continue