Skip to content

Commit

Permalink
Merge pull request #2651 from ZeroNetAlpha/RubberReset
Browse files Browse the repository at this point in the history 
Update combat.dm
  • Loading branch information
@Tk420634
Tk420634 authored Jul 19, 2023
2 parents 705e618 + da057fc commit 2d5a39d
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions code/__DEFINES/combat.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_22_MATCH (BULLET_WOUND_PISTOL_22 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_22_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * 2)
#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22)
#define RUBBERY_RECOIL_PISTOL_22 (BULLET_RECOIL_PISTOL_22 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_22 (BULLET_WOUND_PISTOL_22 * 2)

Expand All @@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_9MM_MATCH (BULLET_WOUND_PISTOL_9MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_9MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * 2)
#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM)
#define RUBBERY_RECOIL_PISTOL_9MM (BULLET_RECOIL_PISTOL_9MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_9MM (BULLET_WOUND_PISTOL_9MM * 2)

Expand All @@ -457,7 +457,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_45ACP_MATCH (BULLET_WOUND_PISTOL_45ACP * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_45ACP_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * 3)
#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP)
#define RUBBERY_RECOIL_PISTOL_45ACP (BULLET_RECOIL_PISTOL_45ACP * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_45ACP (BULLET_WOUND_PISTOL_45ACP * 2)

Expand All @@ -476,7 +476,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_10MM_MATCH (BULLET_WOUND_PISTOL_10MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_10MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * 3)
#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM)
#define RUBBERY_RECOIL_PISTOL_10MM (BULLET_RECOIL_PISTOL_10MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_10MM (BULLET_WOUND_PISTOL_10MM * 2)

Expand All @@ -495,7 +495,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_NEEDLE_MATCH (BULLET_WOUND_PISTOL_NEEDLE * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_NEEDLE_NAKED_MULT 10
#define RUBBERY_DAMAGE_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * 3)
#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE)
#define RUBBERY_RECOIL_PISTOL_NEEDLE (BULLET_RECOIL_PISTOL_NEEDLE * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_NEEDLE (BULLET_WOUND_PISTOL_NEEDLE * 20)

Expand All @@ -514,7 +514,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_38_MATCH (BULLET_WOUND_PISTOL_38 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_38_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * 3)
#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38)
#define RUBBERY_RECOIL_PISTOL_38 (BULLET_RECOIL_PISTOL_38 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_38 (BULLET_WOUND_PISTOL_38 * 2)

Expand All @@ -533,7 +533,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_44_MATCH (BULLET_WOUND_PISTOL_44 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_44_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * 4)
#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44)
#define RUBBERY_RECOIL_PISTOL_44 (BULLET_RECOIL_PISTOL_44 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_44 (BULLET_WOUND_PISTOL_44 * 2)

Expand All @@ -552,7 +552,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_PISTOL_14MM_MATCH (BULLET_WOUND_PISTOL_14MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_PISTOL_14MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * 4)
#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM)
#define RUBBERY_RECOIL_PISTOL_14MM (BULLET_RECOIL_PISTOL_14MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_PISTOL_14MM (BULLET_WOUND_PISTOL_14MM * 2)

Expand All @@ -571,7 +571,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_223_MATCH (BULLET_WOUND_RIFLE_223 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_223_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * 2)
#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223)
#define RUBBERY_RECOIL_RIFLE_223 (BULLET_RECOIL_RIFLE_223 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_223 (BULLET_WOUND_RIFLE_223 * 2)

Expand All @@ -590,7 +590,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_5MM_MATCH (BULLET_WOUND_RIFLE_5MM * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_5MM_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * 2)
#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM)
#define RUBBERY_RECOIL_RIFLE_5MM (BULLET_RECOIL_RIFLE_5MM * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_5MM (BULLET_WOUND_RIFLE_5MM * 2)

Expand All @@ -609,7 +609,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_473_MATCH (BULLET_WOUND_RIFLE_473 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_473_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * 2)
#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473)
#define RUBBERY_RECOIL_RIFLE_473 (BULLET_RECOIL_RIFLE_473 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_473 (BULLET_WOUND_RIFLE_473 * 2)

Expand All @@ -628,7 +628,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_308_MATCH (BULLET_WOUND_RIFLE_308 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_308_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * 3)
#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308)
#define RUBBERY_RECOIL_RIFLE_308 (BULLET_RECOIL_RIFLE_308 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_308 (BULLET_WOUND_RIFLE_308 * 2)

Expand All @@ -647,7 +647,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_4570_MATCH (BULLET_WOUND_RIFLE_4570 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_4570_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * 3)
#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570)
#define RUBBERY_RECOIL_RIFLE_4570 (BULLET_RECOIL_RIFLE_4570 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_4570 (BULLET_WOUND_RIFLE_4570 * 4)

Expand All @@ -666,7 +666,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_3006_MATCH (BULLET_WOUND_RIFLE_3006 * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_3006_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * 3)
#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006)
#define RUBBERY_RECOIL_RIFLE_3006 (BULLET_RECOIL_RIFLE_3006 * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_3006 (BULLET_WOUND_RIFLE_3006 * 4)

Expand All @@ -685,7 +685,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_50MG_MATCH (BULLET_WOUND_RIFLE_50MG * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_50MG_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * 4)
#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG)
#define RUBBERY_RECOIL_RIFLE_50MG (BULLET_RECOIL_RIFLE_50MG * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_50MG (BULLET_WOUND_RIFLE_50MG * 2)

Expand All @@ -704,7 +704,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_RIFLE_GAUSS_MATCH (BULLET_WOUND_RIFLE_GAUSS * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_RIFLE_GAUSS_NAKED_MULT 1
#define RUBBERY_DAMAGE_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * 4)
#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS)
#define RUBBERY_RECOIL_RIFLE_GAUSS (BULLET_RECOIL_RIFLE_GAUSS * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_RIFLE_GAUSS (BULLET_WOUND_RIFLE_GAUSS * 2)

Expand All @@ -724,7 +724,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_PELLET_MATCH (BULLET_WOUND_SHOTGUN_PELLET * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_PELLET_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 2)
#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 1.5)
#define RUBBERY_RECOIL_SHOTGUN_PELLET (BULLET_RECOIL_SHOTGUN_PELLET * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_PELLET (BULLET_WOUND_SHOTGUN_PELLET * 2)

Expand All @@ -743,7 +743,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_SLUG_MATCH (BULLET_WOUND_SHOTGUN_SLUG * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_SLUG_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * 4)
#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG)
#define RUBBERY_RECOIL_SHOTGUN_SLUG (BULLET_RECOIL_SHOTGUN_SLUG * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_SLUG (BULLET_WOUND_SHOTGUN_SLUG * 4)

Expand All @@ -762,7 +762,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_SHOTGUN_TRAIN_MATCH (BULLET_WOUND_SHOTGUN_TRAIN * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_SHOTGUN_TRAIN_NAKED_MULT 1
#define RUBBERY_DAMAGE_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * 4)
#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN)
#define RUBBERY_RECOIL_SHOTGUN_TRAIN (BULLET_RECOIL_SHOTGUN_TRAIN * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_SHOTGUN_TRAIN (BULLET_WOUND_SHOTGUN_TRAIN * 4)

Expand All @@ -781,7 +781,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_FLINTLOCK_MATCH (BULLET_WOUND_FLINTLOCK * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_FLINTLOCK_NAKED_MULT 1
#define RUBBERY_DAMAGE_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * 4)
#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK)
#define RUBBERY_RECOIL_FLINTLOCK (BULLET_RECOIL_FLINTLOCK * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_FLINTLOCK (BULLET_WOUND_FLINTLOCK * 4)

Expand All @@ -800,7 +800,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define BULLET_WOUND_GHOUL_ROCK_MATCH (BULLET_WOUND_GHOUL_ROCK * BULLET_MATCH_MULT_WOUND)
#define BULLET_WOUND_GHOUL_ROCK_NAKED_MULT 2
#define RUBBERY_DAMAGE_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK * RUBBERY_DAMAGE_MULT)
#define RUBBERY_STAMINA_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK * 4)
#define RUBBERY_STAMINA_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK)
#define RUBBERY_RECOIL_GHOUL_ROCK (BULLET_RECOIL_GHOUL_ROCK * RUBBERY_RECOIL_MULT)
#define RUBBERY_WOUND_GHOUL_ROCK (BULLET_WOUND_GHOUL_ROCK * 4)

Expand Down Expand Up @@ -1400,4 +1400,3 @@ GLOBAL_LIST_INIT(main_body_parts, list(
#define FLINTLOCK_PISTOL_PREFIRE_STD 2
#define FLINTLOCK_MINIMUSKET_PREFIRE_STD 1
#define FLINTLOCK_MUSKET_PREFIRE_STD 1.5

0 comments on commit 2d5a39d

Please sign in to comment.