Skip to content

Commit 750bb2c

Browse files
authored
Removes all ties of style from combat , makes style buff insight gain from all sources. (discordia-space#8104)
* epic * Update clothing.dm * Update sanity_mob.dm * ddd
1 parent 5bb50e5 commit 750bb2c

32 files changed

Lines changed: 17 additions & 201 deletions

File tree

code/game/objects/items.dm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,6 @@ var/global/list/items_blood_overlay_by_type = list()
481481
if (grabbed)
482482
if (grabbed.stats.getPerk(PERK_ASS_OF_CONCRETE))
483483
visible_message(SPAN_WARNING("[src] tries to pick up [grabbed], and fails!"))
484-
if (ishuman(src))
485-
var/mob/living/carbon/human/depleted = src
486-
depleted.regen_slickness(-1) // unlucky and unobservant gets the penalty
487-
return
488484

489485
else
490486
if(ishuman(grabbed)) // irish whip if human(grab special), else spin and force rest
@@ -549,9 +545,6 @@ var/global/list/items_blood_overlay_by_type = list()
549545
unEquip(I)
550546
return
551547
I.hand_spin(src)
552-
if (ishuman(src))
553-
var/mob/living/carbon/human/stylish = src
554-
stylish.regen_slickness()
555548

556549
/obj/item/proc/hand_spin(mob/living/carbon/caller) // used for custom behaviour on the above proc
557550
return

code/game/objects/items/weapons/cigs_lighters.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
145145
if(ishuman(loc))
146146
if (src == C.wear_mask && C.check_has_mouth()) // if it's in the human/monkey mouth, transfer reagents to the mob
147147
reagents.trans_to_mob(C, REM, CHEM_INGEST, 0.2) // Most of it is not inhaled... balance reasons.
148-
C.regen_slickness() // smoking is cool, but don't try this at home
149148
else // else just remove some of the reagents
150149
reagents.remove_any(REM)
151150

code/game/objects/items/weapons/nt_melee.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
extended_reach = TRUE
167167
push_attack = TRUE
168168
matter = list(MATERIAL_BIOMATTER = 20, MATERIAL_PLASTEEL = 10) // More expensive, high-end spear
169-
style_damage = 50
170169

171170
/obj/item/tool/sword/nt/spear/equipped(mob/living/W)
172171
..()
@@ -364,7 +363,6 @@
364363
price_tag = 150
365364
allow_spin = FALSE
366365
matter = list(MATERIAL_BIOMATTER = 10, MATERIAL_STEEL = 5) // Easy to mass-produce and arm the faithful
367-
style_damage = 30
368366

369367
/obj/item/stack/thrown/nt/verutum/launchAt()
370368
embed_mult = 600

code/game/objects/items/weapons/tools/knives.dm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@
351351
slot_flags = SLOT_BACK
352352
structure_damage_factor = STRUCTURE_DAMAGE_BLADE
353353
allow_spin = FALSE
354-
style_damage = 20
355-
356354
rarity_value = 20
357355
spawn_tags = SPAWN_TAG_KNIFE
358356

@@ -368,7 +366,6 @@
368366
tool_qualities = list(QUALITY_CUTTING = 10, QUALITY_WIRE_CUTTING = 5, QUALITY_SCREW_DRIVING = 5)
369367
matter = list(MATERIAL_STEEL = 3)
370368
structure_damage_factor = STRUCTURE_DAMAGE_WEAK
371-
style_damage = 30
372369

373370
rarity_value = 60
374371

@@ -384,7 +381,6 @@
384381
tool_qualities = list(QUALITY_CUTTING = 15, QUALITY_WIRE_CUTTING = 10, QUALITY_SCREW_DRIVING = 10)
385382
matter = list(MATERIAL_STEEL = 1, MATERIAL_PLASTEEL = 2)
386383
structure_damage_factor = STRUCTURE_DAMAGE_NORMAL
387-
style_damage = 50
388384

389385
/obj/item/tool/spear/uranium
390386
name = "uranium spear"
@@ -397,7 +393,6 @@
397393
armor_divisor = ARMOR_PEN_DEEP
398394
tool_qualities = list(QUALITY_CUTTING = 10, QUALITY_WIRE_CUTTING = 5, QUALITY_SCREW_DRIVING = 5)
399395
matter = list(MATERIAL_STEEL = 3, MATERIAL_URANIUM = 1)
400-
style_damage = 50
401396

402397
/obj/item/tool/spear/uranium/apply_hit_effect(mob/living/carbon/human/target, mob/living/user, hit_zone)
403398
..()

code/game/objects/objs.dm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
1212
var/damtype = "brute"
1313
var/armor_divisor = 1
14-
var/style_damage = 30 // used for dealing damage to slickness
1514
var/corporation
1615
var/heat = 0
1716

@@ -251,9 +250,6 @@
251250
/obj/proc/add_projectile_penetration(newmult)
252251
armor_divisor = initial(armor_divisor) + newmult
253252

254-
/obj/proc/multiply_projectile_style_damage(newmult)
255-
style_damage = initial(style_damage) * newmult
256-
257253
/obj/proc/multiply_pierce_penetration(newmult)
258254

259255
/obj/proc/multiply_ricochet(newmult)

code/modules/clothing/clothing.dm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,6 @@ BLIND // can't see anything
465465
if(usr.put_in_hands(holding))
466466
usr.visible_message(SPAN_DANGER("\The [usr] pulls a knife out of their boot!"))
467467
holding = null
468-
if (ishuman(usr))
469-
var/mob/living/carbon/human/stylish = usr
470-
stylish.regen_slickness()
471468
else
472469
to_chat(usr, SPAN_WARNING("You need an empty, unbroken hand to do that."))
473470
holding.forceMove(src)
@@ -521,9 +518,6 @@ BLIND // can't see anything
521518
user.visible_message(SPAN_NOTICE("\The [user] shoves \the [I] into \the [src]."))
522519
verbs |= /obj/item/clothing/shoes/proc/draw_knife
523520
update_icon()
524-
if (ishuman(user))
525-
var/mob/living/carbon/human/depleted = user
526-
depleted.regen_slickness(-1)
527521
else
528522
return ..()
529523

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

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,8 @@
109109
if(epicenter != get_turf(src))
110110
target_turf = get_turf_away_from_target_simple(src, epicenter, 8)
111111
var/throw_distance = 8 - 2*severity
112-
var/not_slick = TRUE
113112
if(target_turf) // this means explosions on the same tile will not fling you
114113
throw_at(target_turf, throw_distance, 5)
115-
not_slick = FALSE // only explosions that fling you can be survived with slickness
116-
if(slickness < (9-(2*severity)) * 10)
117-
Weaken(severity) // If they don't get knocked out , weaken them for a bit.
118-
not_slick = TRUE // if you don't have enough slickness, you can't safely ride the boom
119-
else
120-
slickness -= (9-(2*severity)) * 10 // awesome feats aren't something you can do constantly.
121-
122114
switch(severity)
123115
if(1)
124116
b_loss += 500
@@ -131,23 +123,13 @@
131123
adjustEarDamage(30, 120)
132124

133125
if(3)
134-
if(not_slick)
135-
b_loss += 80
136-
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
137-
adjustEarDamage(15, 60)
138-
else
139-
visible_message(SPAN_WARNING("[src] rides the shockwave!"))
140-
dodge_time = get_game_time()
141-
confidence = FALSE
126+
b_loss += 80
127+
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
128+
adjustEarDamage(15, 60)
142129
if(4)
143-
if(not_slick)
144-
b_loss += 50
145-
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
146-
adjustEarDamage(10, 30)
147-
else
148-
visible_message(SPAN_WARNING("[src] rides the shockwave!"))
149-
dodge_time = get_game_time()
150-
confidence = FALSE
130+
b_loss += 50
131+
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
132+
adjustEarDamage(10, 30)
151133

152134
if(bomb_defense)
153135
b_loss = max(b_loss - bomb_defense, 0)
@@ -700,9 +682,6 @@ var/list/rank_prefix = list(\
700682
location.add_vomit_floor(src, 1)
701683

702684
adjustNutrition(-40)
703-
regen_slickness(-3)
704-
dodge_time = get_game_time()
705-
confidence = FALSE
706685
spawn(350) //wait 35 seconds before next volley
707686
lastpuke = 0
708687

@@ -1484,9 +1463,7 @@ var/list/rank_prefix = list(\
14841463
if((species.flags & NO_SLIP) || (shoes && (shoes.item_flags & NOSLIP)))
14851464
return FALSE
14861465
..(slipped_on,stun_duration)
1487-
regen_slickness(-3)
1488-
dodge_time = get_game_time()
1489-
confidence = FALSE
1466+
14901467

14911468
/mob/living/carbon/human/reset_view(atom/A, update_hud = 1)
14921469
..()
@@ -1521,15 +1498,6 @@ var/list/rank_prefix = list(\
15211498
to_chat(src, SPAN_NOTICE("You are now [holding_back ? "holding back your attacks" : "not holding back your attacks"]."))
15221499
return
15231500

1524-
/mob/living/carbon/human/verb/toggle_dodging()
1525-
set name = "Toggle Dodging"
1526-
set desc = "Just stand still while under fire."
1527-
set category = "IC"
1528-
if(stat) return
1529-
dodging = !dodging
1530-
to_chat(src, "<span class='notice'>You are now [dodging ? "dodging incoming fire" : "not dodging incoming fire"].</span>")
1531-
return
1532-
15331501
/mob/living/carbon/human/verb/access_holster()
15341502
set name = "Holster"
15351503
set desc = "Try to access your holsters."

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
M.put_in_active_hand(G)
121121
G.synch()
122122
LAssailant = M
123-
H.regen_slickness() //sick skills!
124123

125124
break_all_grabs(H)
126125

@@ -280,12 +279,6 @@
280279
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
281280
visible_message(SPAN_WARNING("[M] attempted to disarm [src]"))
282281
return
283-
if (ishuman(M))
284-
var/mob/living/carbon/human/stylish = M
285-
stylish.regen_slickness() // disarming your opponent looks slick
286-
regen_slickness(-1) // being disarmed looks clumsy
287-
dodge_time = get_game_time()
288-
confidence = FALSE
289282
if(istype(I, /obj/item/twohanded/offhand)) //did someone dare to switch to offhand to not get disarmed?
290283
unEquip(src.get_inactive_hand())
291284
visible_message(SPAN_DANGER("[M] has disarmed [src]!"))

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,10 @@ meteor_act
88
*/
99

1010
/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
11-
12-
if (dodging && slickness && P.style_damage <= slickness && !incapacitated(INCAPACITATION_UNMOVING))
13-
visible_message(SPAN_WARNING("[src] dodges [P]!"))
14-
slickness -= P.style_damage
15-
dodge_time = get_game_time()
16-
confidence = FALSE
17-
external_recoil(P.style_damage)
18-
return PROJECTILE_FORCE_MISS_SILENCED // src dodged.
19-
2011
def_zone = check_zone(def_zone)
2112
if(!has_organ(def_zone))
2213
return PROJECTILE_FORCE_MISS //if they don't have the organ in question then the projectile just passes by.
2314

24-
dodge_time = get_game_time() // stylish person got hit in a limb they had
25-
confidence = FALSE // so they get the slickness regen delay
2615

2716
var/obj/item/organ/external/organ = get_organ(def_zone)
2817

@@ -425,15 +414,6 @@ meteor_act
425414
throw_mode_off()
426415
return
427416

428-
if (dodging && slickness && O.style_damage <= slickness && !incapacitated(INCAPACITATION_UNMOVING))
429-
visible_message(SPAN_WARNING("[src] dodges [O]!"))
430-
slickness -= O.style_damage
431-
dodge_time = get_game_time()
432-
confidence = FALSE
433-
external_recoil(O.style_damage)
434-
return
435-
436-
437417
var/dtype = O.damtype
438418
var/throw_damage = O.throwforce
439419
var/zone
@@ -453,12 +433,6 @@ meteor_act
453433
visible_message(SPAN_NOTICE("\The [O] misses [src] narrowly!"))
454434
return
455435

456-
dodge_time = get_game_time() // stylish person got hit and wasn't saved by RNG
457-
confidence = FALSE // so they get the slickness regen delay
458-
if (ishuman(O.thrower))
459-
var/mob/living/carbon/human/stylish = O.thrower
460-
stylish.regen_slickness() // throwing something and hitting your target is slick
461-
462436

463437
O.throwing = 0 //it hit, so stop moving
464438
/// Get hit with glass shards , your fibers are on them now, or with a rod idk.
@@ -498,9 +472,6 @@ meteor_act
498472
var/embed_chance = (damage - embed_threshold)*I.embed_mult
499473
if (embed_chance > 0 && prob(embed_chance))
500474
affecting.embed(I)
501-
if (ishuman(I.thrower))
502-
var/mob/living/carbon/human/stylish = I.thrower
503-
stylish.regen_slickness()
504475

505476
// Begin BS12 momentum-transfer code.
506477
var/mass = 1.5

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
var/gunshot_residue
7272
var/holding_back // Are you trying not to hurt your opponent?
7373
var/blocking = FALSE //ready to block melee attacks?
74-
var/dodging = TRUE // are you dodging those shots?
7574

7675
mob_bump_flag = HUMAN
7776
mob_push_flags = ~HEAVY
@@ -100,8 +99,6 @@
10099

101100
var/style = 0
102101
var/max_style = MAX_HUMAN_STYLE
103-
var/slickness = 0 // used for stylish dodging stuff, capped at style * 10
104-
var/confidence = TRUE // needed to notify player when slickness passively regens
105102

106103
var/shock_resist = 0 // Resistance to paincrit
107104

0 commit comments

Comments
 (0)