Makes crusher trophies craftable, reworks icewing/magmawing/blaster tube trophies (#96670)

This commit is contained in:
SmArtKar
2026-07-07 07:58:38 +10:00
committed by GitHub
parent e3dc808d9d
commit 3f3b569c65
21 changed files with 367 additions and 135 deletions
@@ -12,8 +12,6 @@
verb_ask = "spittles questioningly"
verb_exclaim = "splutters and gurgles"
verb_yell = "splutters and gurgles"
crusher_loot = /obj/item/crusher_trophy/bileworm_spewlet
crusher_drop_chance = 15
butcher_results = list(/obj/item/food/meat/slab/bugmeat = 4)
guaranteed_butcher_results = list(
/obj/effect/gibspawner/generic = 1,
@@ -6,7 +6,7 @@
icon_state = "bilehorn"
allowed_instrument_ids = "bilehorn"
inhand_icon_state = null
custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 2)
custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 12, /datum/material/bone = SHEET_MATERIAL_AMOUNT * 2)
/datum/crafting_recipe/bilehorn
name = "Bilehorn"
@@ -27,7 +27,6 @@
ai_controller = /datum/ai_controller/basic_controller/brimdemon
crusher_loot = /obj/item/crusher_trophy/brimdemon_fang
butcher_results = list(
/obj/item/food/meat/slab = 2,
/obj/effect/decal/cleanable/brimdust = 1,
@@ -29,7 +29,6 @@
ai_controller = /datum/ai_controller/basic_controller/goliath
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle
butcher_results = list(/obj/item/food/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1)
/// Icon state to use when tentacles are available
@@ -199,7 +198,6 @@
This one is clearly ancient, and its tentacles constantly churn the earth around it."
maxHealth = 400
health = 400
crusher_drop_chance = 100
/// Don't re-check nearby turfs for this long
COOLDOWN_DECLARE(retarget_turfs_cooldown)
/// List of places we might spawn a tentacle, if we're alive
@@ -23,7 +23,6 @@
speak_emote = list("gurgles")
attack_sound = 'sound/items/weapons/pierce.ogg'
throw_blocked_message = "bounces harmlessly off of"
crusher_loot = /obj/item/crusher_trophy/legion_skull
death_message = "wails in chorus and dissolves into quivering flesh."
ai_controller = /datum/ai_controller/basic_controller/legion
/// What kind of mob do we spawn?
@@ -142,10 +141,8 @@
maxHealth = 60
health = 60
speed = 2
crusher_drop_chance = 20
corpse_type = /obj/effect/mob_spawn/corpse/human/legioninfested/dwarf
/// Like a Legion but larger and spawns regular Legions, not currently used anywhere and very soulful
/mob/living/basic/mining/legion/large
name = "myriad"
@@ -25,7 +25,6 @@
/obj/item/stack/sheet/bone = 2,
/obj/item/organ/monster_core/rush_gland = 1,
)
crusher_loot = /obj/item/crusher_trophy/lobster_claw
ai_controller = /datum/ai_controller/basic_controller/lobstrosity
/// Charging ability
var/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/charge
@@ -160,7 +159,6 @@
/obj/item/stack/sheet/bone = 1,
/obj/item/organ/monster_core/rush_gland = 1,
)
crusher_loot = null
ai_controller = /datum/ai_controller/basic_controller/lobstrosity/juvenile
snip_speed = 6.5 SECONDS
charge_type = /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/shrimp
@@ -18,7 +18,6 @@
attack_sound = 'sound/items/weapons/bladeslice.ogg'
attack_verb_continuous = "buffets"
attack_verb_simple = "buffet"
crusher_loot = /obj/item/crusher_trophy/watcher_wing
ai_controller = /datum/ai_controller/basic_controller/watcher
butcher_results = list(
/obj/item/stack/sheet/bone = 1,
@@ -90,8 +89,11 @@
health = 175
projectile_type = /obj/projectile/temp/watcher/magma_wing
gaze_attack = /datum/action/cooldown/mob_cooldown/watcher_gaze/fire
crusher_loot = /obj/item/crusher_trophy/blaster_tubes/magma_wing
crusher_drop_chance = 100 // There's only going to be one of these per round throw them a bone
butcher_results = list(
/obj/item/stack/sheet/bone = 1,
/obj/item/stack/ore/diamond = 2,
/obj/item/stack/sheet/sinew/magmawing = 3,
)
/// Less durable, freezing projectiles
/mob/living/basic/mining/watcher/icewing
@@ -106,5 +108,8 @@
projectile_type = /obj/projectile/temp/watcher/ice_wing
gaze_attack = /datum/action/cooldown/mob_cooldown/watcher_gaze/ice
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/bone = 1)
crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing
crusher_drop_chance = 100
butcher_results = list(
/obj/item/stack/sheet/bone = 1,
/obj/item/stack/ore/diamond = 5,
/obj/item/stack/sheet/sinew/icewing = 3,
)