Skip to content

Commit

Permalink
buckshot now has multiplier exclusive to xenos. Unsolved issue of poi…
Browse files Browse the repository at this point in the history
…ntblank shot dealing hueg damage.
  • Loading branch information
KoishiVibe committed Mar 19, 2024
1 parent 001734a commit 19b8032
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions code/modules/projectiles/projectile.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//Some debug variables. Toggle them to 1 in order to see the related debug messages. Helpful when testing out formulas.
#define DEBUG_HIT_CHANCE 0
#define DEBUG_HUMAN_DEFENSE 0
#define DEBUG_XENO_DEFENSE 0
#define DEBUG_HIT_CHANCE 1
#define DEBUG_HUMAN_DEFENSE 1
#define DEBUG_XENO_DEFENSE 1

//The actual bullet objects.
/obj/projectile
Expand Down Expand Up @@ -1045,6 +1045,9 @@
emote("scream")
to_chat(src, SPAN_HIGHDANGER("You scream in pain as the impact sends <B>shrapnel</b> into the wound!"))
SEND_SIGNAL(P, COMSIG_POST_BULLET_ACT_HUMAN, src, damage, damage_result)
#if DEBUG_HUMAN_DEFENSE
to_world(SPAN_DEBUG("([P]) Damage: [damage] | damage_result: [damage_result]"))
#endif

//Deal with xeno bullets.
/mob/living/carbon/xenomorph/bullet_act(obj/projectile/P)
Expand Down Expand Up @@ -1126,6 +1129,9 @@
updatehealth()

SEND_SIGNAL(P, COMSIG_BULLET_ACT_XENO, src, damage, damage_result)
#if DEBUG_XENO_DEFENSE
to_world(SPAN_DEBUG("([P]) Damage: [damage] | damage_result: [damage_result]"))
#endif

return TRUE

Expand Down

0 comments on commit 19b8032

Please sign in to comment.