cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 14:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

better (#14503)

Browse Source
This commit is contained in:
Zonespace
2022-06-24 17:25:58 -07:00
committed by GitHub
parent 981ddf0e7c
commit 61700e2d92
6 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
View File

@@ -91,6 +91,11 @@
if(crusher_dmg && crusher_loot && crusher_dmg.total_damage >= maxHealth * 0.6)
spawn_crusher_loot()
crusher_kill = TRUE
//SKYRAT ADDITION START - ASHWALKER TROPHIES
var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage)
if(!crusher_kill && ashie_damage && crusher_loot && ashie_damage.total_damage >= maxHealth * 0.6)
spawn_crusher_loot()
//SKYRAT ADDITION END
if(true_spawn && !(flags_1 & ADMIN_SPAWNED_1))
var/tab = "megafauna_kills"
if(crusher_kill)

8
code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
View File

@@ -54,8 +54,16 @@
/mob/living/simple_animal/hostile/asteroid/death(gibbed)
SSblackbox.record_feedback("tally", "mobs_killed_mining", 1, type)
var/datum/status_effect/crusher_damage/C = has_status_effect(/datum/status_effect/crusher_damage)
var/crusher_loot_spawned = FALSE //SKYRAT ADDITION
if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item
spawn_crusher_loot()
crusher_loot_spawned = TRUE //SKYRAT ADDITION
//SKYRAT ADDITION START - ASHWALKER TROPHIES
var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage)
if(!crusher_loot_spawned && ashie_damage && crusher_loot && prob((ashie_damage.total_damage / maxHealth) * crusher_drop_mod))
spawn_crusher_loot()
crusher_loot_spawned = TRUE
//SKYRAT ADDITION END
..(gibbed)
/mob/living/simple_animal/hostile/asteroid/proc/spawn_crusher_loot()