mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
[MIRROR] Miner Style Points 2: Style on Everyone [MDB IGNORE] (#20826)
* Miner Style Points 2: Style on Everyone (#74690) ## About The Pull Request A re-open of https://github.com/tgstation/tgstation/pull/66326 with Fikou's permission Adds the style meter, it can be bought from the mining vendor for 1500 points, it is an attachment to your glasses. The style meter creates a display on your hud, with your recent actions, like attacking enemies, killing them, mining ore etc. Actions like spinning or flipping increase your score multiplier, making you get more points. Your style meter affects how much ore you get from mining rocks. By default with the meter, you get 20% less ore, but at the highest, you can get 1.2x the ore from mining. In addition, on B-tier or above, you can "hotswap" items, by attacking an item in your backpack with one in your hand (should it fit and all that). Also features a leaderboard for highest style point count! New streamable: https://streamable.com/eewi6l The following are sources of points: - Killing things - Killing big things - Killing small things - Punching things - Melee'ing things - Mining rocks and ores - Having matrix traps detonate - Hit, defuse, and detonate gibtonite - Detonate crusher marks - Scan geysers - Parry projectiles (others or your own) Oh, right. While wearing the style meter, you're able to parry any lavaland-based projectile by clicking on it or the tile it is on, which reflects it back in a 7 degree arc, making it 20% faster and 15% more damaging. Usually not very easy. Maybe-plan in the future for some syndicate variant of this (with bullet parrying and appropriate style sources, etc.), but not for this PR Thanks to Arcane, multitooling the style meter will make it play some sounds on rank-up.  https://streamable.com/nheaky Parrying in action ## Why It's Good For The Game Makes miners bring more ore in a fun way. ## Changelog 🆑 Fikou, Zonespace, Arcane for voicing add: The mining vendor now has a style meter. This meter gauges your style points and uses them to improve your ore yield. /🆑 --------- Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com> * Miner Style Points 2: Style on Everyone --------- Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Fikou <23585223+Fikou@ users.noreply.github.com>
This commit is contained in:
@@ -101,17 +101,21 @@
|
||||
if(!QDELETED(C))
|
||||
C.total_damage += target_health - L.health //we did some damage, but let's not assume how much we did
|
||||
new /obj/effect/temp_visual/kinetic_blast(get_turf(L))
|
||||
var/backstabbed = FALSE
|
||||
var/combined_damage = detonation_damage
|
||||
var/backstab_dir = get_dir(user, L)
|
||||
var/def_check = L.getarmor(type = BOMB)
|
||||
if((user.dir & backstab_dir) && (L.dir & backstab_dir))
|
||||
if(!QDELETED(C))
|
||||
C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item
|
||||
L.apply_damage(detonation_damage + backstab_bonus, BRUTE, blocked = def_check)
|
||||
backstabbed = TRUE
|
||||
combined_damage += backstab_bonus
|
||||
playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, TRUE) //Seriously who spelled it wrong
|
||||
else
|
||||
if(!QDELETED(C))
|
||||
C.total_damage += detonation_damage
|
||||
L.apply_damage(detonation_damage, BRUTE, blocked = def_check)
|
||||
|
||||
if(!QDELETED(C))
|
||||
C.total_damage += combined_damage
|
||||
|
||||
|
||||
SEND_SIGNAL(user, COMSIG_LIVING_CRUSHER_DETONATE, L, src, backstabbed)
|
||||
L.apply_damage(combined_damage, BRUTE, blocked = def_check)
|
||||
|
||||
/obj/item/kinetic_crusher/attack_secondary(atom/target, mob/living/user, clickparams)
|
||||
return SECONDARY_ATTACK_CONTINUE_CHAIN
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
/// the modifier to resonance_damage; affected by the quick_burst_mod from the resonator
|
||||
var/damage_multiplier = 1
|
||||
/// the parent creator (user) of this field
|
||||
var/creator
|
||||
var/mob/creator
|
||||
/// the parent resonator of this field
|
||||
var/obj/item/resonator/parent_resonator
|
||||
/// whether the field is rupturing currently or not (to prevent recursion)
|
||||
@@ -127,6 +127,7 @@
|
||||
for(var/mob/living/attacked_living in src_turf)
|
||||
if(creator)
|
||||
log_combat(creator, attacked_living, "used a resonator field on", "resonator")
|
||||
SEND_SIGNAL(creator, COMSIG_LIVING_RESONATOR_BURST, creator, attacked_living)
|
||||
to_chat(attacked_living, span_userdanger("[src] ruptured with you in it!"))
|
||||
attacked_living.apply_damage(resonance_damage, BRUTE)
|
||||
attacked_living.add_movespeed_modifier(/datum/movespeed_modifier/resonance)
|
||||
|
||||
Reference in New Issue
Block a user