cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Brings fairness back to holodeck

Browse Source
This commit is contained in:
Casey
2022-06-05 17:51:27 -04:00
committed by CHOMPStation2
parent b0b0ec8bc4
commit d251046e35
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items.dm
View File

@@ -107,10 +107,17 @@
var/tip_timer // reference to timer id for a tooltip we might open soon var/tip_timer // reference to timer id for a tooltip we might open soon
<<<<<<< HEAD
/obj/item/Initialize(mapload) /obj/item/Initialize(mapload)
. = ..() . = ..()
if(islist(origin_tech)) if(islist(origin_tech))
origin_tech = typelist(NAMEOF(src, origin_tech), 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(embed_chance < 0)
if(sharp) if(sharp)
embed_chance = max(5, round(force/w_class)) embed_chance = max(5, round(force/w_class))

1
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -278,6 +278,7 @@
/obj/item/weapon/holo /obj/item/weapon/holo
damtype = HALLOSS damtype = HALLOSS
no_attack_log = 1 no_attack_log = 1
no_random_knockdown = TRUE
/obj/item/weapon/holo/esword /obj/item/weapon/holo/esword
desc = "May the force be within you. Sorta." desc = "May the force be within you. Sorta."

2
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -321,7 +321,7 @@ emp_act
H.bloody_body(src) H.bloody_body(src)
H.bloody_hands(src) H.bloody_hands(src)
if(!stat) if(!stat && !(I.no_random_knockdown))
switch(hit_zone) switch(hit_zone)
if(BP_HEAD)//Harder to score a stun but if you do it lasts a bit longer if(BP_HEAD)//Harder to score a stun but if you do it lasts a bit longer
if(prob(effective_force)) if(prob(effective_force))