Skip to content

Commit 1ed8dde

Browse files
Kapu1178Kapu1178
authored
skill tweaks (#1111)
1 parent 9e6f4bc commit 1ed8dde

File tree

25 files changed

+40
-50
lines changed

25 files changed

+40
-50
lines changed

‎code/datums/components/embedded.dm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,16 @@
238238
if(harmful && user.stats.cooldown_finished("ripout_embed_check"))
239239
user.stats.set_cooldown("ripout_embed_check", INFINITY)
240240
var/datum/roll_result/result = user.stat_roll(12, /datum/rpg_skill/handicraft)
241+
result.do_skill_sound(user)
241242
switch(result.outcome)
242243
if(CRIT_SUCCESS)
243244
harmful = FALSE
244245
time_taken = 0
245-
to_chat(user, result.create_tooltip("Many hours spent on delicate projects has prepared you for this moment. (Instant and harmless removal)"))
246+
to_chat(user, result.create_tooltip("Many hours spent on delicate projects has prepared you for this moment."))
246247

247248
if(SUCCESS)
248249
time_taken = time_taken * 0.2
249-
to_chat(user, result.create_tooltip("Your hands are more than accustomed to careful tasks. (Accelerated removal)"))
250+
to_chat(user, result.create_tooltip("Your hands are more than accustomed to careful tasks."))
250251

251252
if(CRIT_FAILURE)
252253
to_chat(user, result.create_tooltip("At a crucial moment, you second guess yourself, pressing the object deeper into your flesh."))

‎code/game/objects/items.dm‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,10 +1338,12 @@ DEFINE_INTERACTABLE(/obj/item)
13381338
var/datum/roll_result/result = user.stat_roll(7, /datum/rpg_skill/handicraft)
13391339
switch(result.outcome)
13401340
if(CRIT_SUCCESS)
1341-
to_chat(user, result.create_tooltip("A swift execution. A job well done. (Tool usage time reduced)"))
1341+
result.do_skill_sound(user)
1342+
to_chat(user, result.create_tooltip("A swift execution. A job well done."))
13421343
delay = delay * 0.25
13431344

1344-
user.stats.set_cooldown("use_tool", max(delay, 5 SECONDS))
1345+
1346+
user.stats.set_cooldown("use_tool", max(delay, 10 SECONDS))
13451347

13461348
// Play tool sound at the beginning of tool usage.
13471349
play_tool_sound(target, volume)

‎code/modules/detectivework/detective_work.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
stats.set_cooldown("examine_forensic_analysis", 15 SECONDS)
238238
return
239239

240+
result.do_skill_sound(src)
240241
stats.examined_object_weakrefs[WEAKREF(examined)] = TRUE
241242
stats.set_cooldown("examine_forensic_analysis", 15 MINUTES)
242243

‎code/modules/mob/living/carbon/carbon_defense.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250

251251
var/list/holding = list(target.get_active_held_item() = 60, target.get_inactive_held_item() = 30)
252252

253-
var/roll = stat_roll(10, /datum/rpg_skill/skirmish).outcome
253+
var/roll = stat_roll(14, /datum/rpg_skill/skirmish, defender = target).outcome
254254

255255
//Handle unintended consequences
256256
for(var/obj/item/I in holding)

‎code/modules/mob/living/carbon/human/death.dm‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
4949
SSblackbox.ReportDeath(src)
5050
log_message("has died (BRUTE: [src.getBruteLoss()], BURN: [src.getFireLoss()], TOX: [src.getToxLoss()], OXY: [src.getOxyLoss()], CLONE: [src.getCloneLoss()])", LOG_ATTACK)
5151

52-
for(var/mob/living/L in viewers(src, world.view) - src)
53-
if(L.is_blind() || L.stat != CONSCIOUS || !L.client)
54-
continue
55-
56-
var/datum/roll_result/result = L.stat_roll(7, /datum/rpg_skill/willpower)
57-
switch(result.outcome)
58-
if(FAILURE, CRIT_FAILURE)
59-
if(L.apply_status_effect(/datum/status_effect/skill_mod/witness_death))
60-
to_chat(L, result.create_tooltip("For but a moment, there is nothing. Nothing but the gnawing realisation of what you have just witnessed."))
61-
6252
/mob/living/carbon/human/proc/makeSkeleton()
6353
ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC)
6454
set_species(/datum/species/skeleton)

‎code/modules/mob/living/carbon/human/examine.dm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,12 @@
374374

375375
var/possible_invisible_damage = getToxLoss() > 20 || getBrainLoss()
376376

377-
if((possible_invisible_damage || length(fucked_reasons) || visible_bodyparts >= 3))
377+
if(!length(get_missing_limbs()) && (possible_invisible_damage || length(fucked_reasons) || visible_bodyparts >= 3))
378378
var/datum/roll_result/result = living_user.stat_roll(15, /datum/rpg_skill/anatomia)
379379
switch(result.outcome)
380380
if(SUCCESS, CRIT_SUCCESS)
381381
spawn(0)
382+
result.do_skill_sound(living_user)
382383
if(possible_invisible_damage && living_user.stats.cooldown_finished("found_invisible_damage_[REF(src)]"))
383384
to_chat(living_user, result.create_tooltip("Something is not right, this person is not well. You can feel it in your very core."))
384385
living_user.stats.set_cooldown("found_invisible_damage_[REF(src)]", INFINITY) // Never again

‎code/modules/mob/living/carbon/human/human.dm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,10 @@
530530
if (!do_after(src, target, 3 SECONDS, DO_PUBLIC, extra_checks = CALLBACK(src, PROC_REF(can_perform_cpr), target)))
531531
break
532532

533+
visible_message(
534+
span_notice("[src] pushes down on [target.name]'s chest!"),
535+
)
536+
533537
var/datum/roll_result/result = stat_roll(6, /datum/rpg_skill/skirmish)
534538
switch(result.outcome)
535539
if(CRIT_SUCCESS)
@@ -547,10 +551,6 @@
547551
if(chest.break_bones(TRUE))
548552
to_chat(src, result.create_tooltip("Your strength betrays you as you shatter [target.name]'s [chest.encased]."))
549553

550-
visible_message(
551-
span_notice("[src] pushes down on [target.name]'s chest!"),
552-
)
553-
554554
log_combat(src, target, "CPRed")
555555

556556
if(target.breathe(TRUE) == BREATH_OKAY)

‎code/modules/mob/living/carbon/human/human_defense.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
if(HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER))
186186
roll = SUCCESS
187187
else
188-
roll = user.stat_roll(10, /datum/rpg_skill/skirmish, bodyzone_modifier, -7).outcome
188+
roll = user.stat_roll(10, /datum/rpg_skill/skirmish, bodyzone_modifier, -7, src).outcome
189189

190190
var/hit_zone
191191
switch(roll)

‎code/modules/mob/living/carbon/human/species.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
10501050
// Set damage and find hit bodypart using weighted rng
10511051
var/target_zone = deprecise_zone(user.zone_selected)
10521052
var/bodyzone_modifier = GLOB.bodyzone_gurps_mods[target_zone]
1053-
var/roll = !HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) ? user.stat_roll(10, /datum/rpg_skill/skirmish, bodyzone_modifier, -7).outcome : SUCCESS
1053+
var/roll = !HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) ? user.stat_roll(10, /datum/rpg_skill/skirmish, bodyzone_modifier, -7, target).outcome : SUCCESS
10541054
// If we succeeded, hit the target area.
10551055
var/attacking_zone = (roll >= SUCCESS) ? target_zone : target.get_random_valid_zone()
10561056
var/obj/item/bodypart/affecting

‎code/modules/mob/living/carbon/human/status_procs.dm‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,3 @@
3838
. = ..()
3939
if(.)
4040
update_body_parts()
41-
42-
/mob/living/carbon/human/fakedeath(source, silent)
43-
. = ..()
44-
for(var/mob/living/L in viewers(src, world.view) - src)
45-
if(L.is_blind() || L.stat != CONSCIOUS || !L.client)
46-
continue
47-
48-
var/datum/roll_result/result = L.stat_roll(6, /datum/rpg_skill/willpower)
49-
switch(result.outcome)
50-
if(FAILURE, CRIT_FAILURE)
51-
if(L.apply_status_effect(/datum/status_effect/skill_mod/witness_death))
52-
to_chat(L, result.create_tooltip("For but a moment, there is nothing. Nothing but the gnawing realisation of what you have just witnessed."))

0 commit comments

Comments
 (0)