Skip to content

Commit

Permalink
No more crusher trophy effects (#3046)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
removes crusher trophies relevance from crushers. I didn't fully remove
them because they are neat for crafting and.. as trophies
atomization of #2848

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
miner power gamer cruft. Its not really needed when we are trying to
balance stuff around guns. Crusher still remains the strongest mostly
obtainable melee weapon.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Trophies can no longer be used in crushers
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
FalloutFalcon authored Jun 4, 2024
1 parent 27992f5 commit 9b14e5a
Show file tree
Hide file tree
Showing 32 changed files with 302 additions and 924 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
/obj/structure/stone_tile/slab,
/mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
},
/turf/open/indestructible/boss,
/area/ruin)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,6 @@
"zb" = (
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
crusher_loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/crusher_trophy/miner_eye,/obj/item/keycard/gatedrop/lavacanyon)
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/overmap_encounter/planetoid/cave/explored)
Expand Down
6 changes: 3 additions & 3 deletions code/datums/components/crafting/recipes/tribal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
time = 35
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 3,
/obj/item/crusher_trophy/wolf_ear = 2,
/obj/item/crusher_trophy/fang = 1)
/obj/item/mob_trophy/wolf_ear = 2,
/obj/item/mob_trophy/fang = 1)
category = CAT_PRIMAL

/datum/crafting_recipe/bonecodpiece
name = "Skull Codpiece"
result = /obj/item/clothing/accessory/skullcodpiece
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/crusher_trophy/legion_skull = 1,
/obj/item/mob_trophy/legion_skull = 1,
/obj/item/stack/sheet/animalhide/goliath_hide = 1)
category = CAT_PRIMAL

Expand Down
46 changes: 23 additions & 23 deletions code/modules/cargo/exports/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,40 +58,40 @@
/obj/item/guardiancreator/miner/choose,//this is basically the most valulable mining loot so good luck getting a miner to part ways
/obj/item/gun/magic/staff/spellblade,
)

/*
/datum/export/lavaland/trophycommon
cost = 1500
unit_name = "common hunting trophy"
export_types = list(/obj/item/crusher_trophy/legion_skull,
/obj/item/crusher_trophy/wolf_ear,
/obj/item/crusher_trophy/bear_paw,
/obj/item/crusher_trophy/goliath_tentacle,
/obj/item/crusher_trophy/watcher_wing)
export_types = list(/obj/item/mob_trophy/legion_skull,
/obj/item/mob_trophy/wolf_ear,
/obj/item/mob_trophy/bear_paw,
/obj/item/mob_trophy/goliath_tentacle,
/obj/item/mob_trophy/watcher_wing)
/datum/export/lavaland/trophyrare
cost = 5000
unit_name = "rare hunting trophy"
export_types = list(/obj/item/crusher_trophy/dwarf_skull,
/obj/item/crusher_trophy/fang,
/obj/item/crusher_trophy/war_paw,
/obj/item/crusher_trophy/elder_tentacle,
/obj/item/crusher_trophy/ice_crystal,
/obj/item/crusher_trophy/magma_wing,
/obj/item/crusher_trophy/tail_spike,
/obj/item/crusher_trophy/ice_wing)
export_types = list(/obj/item/mob_trophy/dwarf_skull,
/obj/item/mob_trophy/fang,
/obj/item/mob_trophy/war_paw,
/obj/item/mob_trophy/elder_tentacle,
/obj/item/mob_trophy/ice_crystal,
/obj/item/mob_trophy/magma_wing,
/obj/item/mob_trophy/tail_spike,
/obj/item/mob_trophy/ice_wing)
/datum/export/lavaland/trophymega
cost = 10000
unit_name = "big game hunting trophy"
export_types = list(/obj/item/crusher_trophy/legionnaire_spine,
/obj/item/crusher_trophy/ash_spike,
/obj/item/crusher_trophy/demon_claws,
/obj/item/crusher_trophy/broodmother_tongue,
/obj/item/crusher_trophy/ice_block_talisman,
/obj/item/crusher_trophy/king_goat,
/obj/item/crusher_trophy/miner_eye,
/obj/item/crusher_trophy/vortex_talisman,
/obj/item/crusher_trophy/blaster_tubes)
export_types = list(/obj/item/mob_trophy/legionnaire_spine,
/obj/item/mob_trophy/ash_spike,
/obj/item/mob_trophy/demon_claws,
/obj/item/mob_trophy/broodmother_tongue,
/obj/item/mob_trophy/ice_block_talisman,
/obj/item/mob_trophy/miner_eye,
/obj/item/mob_trophy/vortex_talisman,
/obj/item/mob_trophy/blaster_tubes)
*/

/datum/export/lavaland/megafauna/total_printout(datum/export_report/ex, notes = TRUE) //in the unlikely case a miner feels like selling megafauna loot
. = ..()
Expand Down
Loading

0 comments on commit 9b14e5a

Please sign in to comment.