cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

make it build

Browse Source
This commit is contained in:
nevimer
2025-09-07 00:47:34 -04:00
parent b348b617a3
commit 0e31590d16
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/crusher_loot.dm
-1
View File
@@ -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))
code/game/objects/items/melee/energy.dm
+1 -1
View File
@@ -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
code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+1 -1
View File
@@ -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