mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Brings fairness back to holodeck
This commit is contained in:
@@ -107,10 +107,17 @@
|
||||
|
||||
var/tip_timer // reference to timer id for a tooltip we might open soon
|
||||
|
||||
<<<<<<< HEAD
|
||||
/obj/item/Initialize(mapload)
|
||||
. = ..()
|
||||
if(islist(origin_tech))
|
||||
origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech)
|
||||
=======
|
||||
var/no_random_knockdown = FALSE //stops item from being able to randomly knock people down in combat
|
||||
|
||||
/obj/item/New()
|
||||
..()
|
||||
>>>>>>> bf0f84e952... Merge pull request #13041 from Heroman3003/fair-holodeck
|
||||
if(embed_chance < 0)
|
||||
if(sharp)
|
||||
embed_chance = max(5, round(force/w_class))
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user