Merge pull request #13041 from Heroman3003/fair-holodeck

Brings fairness back to holodeck
This commit is contained in:
Casey
2022-06-05 17:51:27 -04:00
committed by GitHub
3 changed files with 4 additions and 1 deletions
+2
View File
@@ -107,6 +107,8 @@
var/tip_timer // reference to timer id for a tooltip we might open soon
var/no_random_knockdown = FALSE //stops item from being able to randomly knock people down in combat
/obj/item/New()
..()
if(embed_chance < 0)
+1
View File
@@ -278,6 +278,7 @@
/obj/item/weapon/holo
damtype = HALLOSS
no_attack_log = 1
no_random_knockdown = TRUE
/obj/item/weapon/holo/esword
desc = "May the force be within you. Sorta."
@@ -321,7 +321,7 @@ emp_act
H.bloody_body(src)
H.bloody_hands(src)
if(!stat)
if(!stat && !(I.no_random_knockdown))
switch(hit_zone)
if(BP_HEAD)//Harder to score a stun but if you do it lasts a bit longer
if(prob(effective_force))