mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
[MIRROR] Reduce Clumsy Gene's Obnoxious RNG (#12397)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Will
Kashargul
parent
de1913c72a
commit
76924ab597
@@ -23,7 +23,7 @@
|
||||
drop_sound = 'sound/items/drop/device.ogg'
|
||||
|
||||
/obj/item/grenade/proc/clown_check(var/mob/living/user)
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_HARM_CHANCE(user))
|
||||
to_chat(user, span_warning("Huh? How does this thing work?"))
|
||||
|
||||
activate(user)
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
if(!user.IsAdvancedToolUser())
|
||||
return
|
||||
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_warning("Uh ... how do those things work?!"))
|
||||
attempt_to_cuff(user, user)
|
||||
return
|
||||
@@ -227,7 +227,7 @@
|
||||
if(!user.IsAdvancedToolUser())
|
||||
return
|
||||
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_warning("Uh ... how do those things work?!"))
|
||||
place_legcuffs(user, user)
|
||||
return
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
|
||||
if(user.a_intent != I_HELP)
|
||||
if(user.zone_sel.selecting == BP_HEAD || user.zone_sel.selecting == O_EYES)
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_HARM_CHANCE(user))
|
||||
M = user
|
||||
return eyestab(M,user)
|
||||
else
|
||||
@@ -186,7 +186,7 @@
|
||||
|
||||
/* From the time of Clowns. Commented out for posterity, and sanity.
|
||||
/obj/item/material/knife/attack(target as mob, mob/living/user as mob)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_HARM_CHANCE(user))
|
||||
to_chat(user, span_warning("You accidentally cut yourself with \the [src]."))
|
||||
user.take_organ_damage(20)
|
||||
return
|
||||
@@ -212,7 +212,7 @@
|
||||
pickup_sound = 'sound/items/pickup/wooden.ogg'
|
||||
|
||||
/obj/item/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_HARM_CHANCE(user))
|
||||
to_chat(user, span_warning("\The [src] slips out of your hand and hits your head."))
|
||||
user.take_organ_damage(10)
|
||||
user.Paralyse(2)
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
return
|
||||
|
||||
if (active)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_HARM_CHANCE(user))
|
||||
user.visible_message(span_danger("\The [user] accidentally cuts [user.p_their()] with \the [src]."),\
|
||||
span_danger("You accidentally cut yourself with \the [src]."))
|
||||
user.take_organ_damage(5,5)
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_warning("You beat yourself in the head with [src]."))
|
||||
user.take_organ_damage(5)
|
||||
active = !active
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
add_fingerprint(user)
|
||||
|
||||
/obj/item/melee/baton/attack(mob/M, mob/user)
|
||||
if(status && (CLUMSY in user.mutations) && prob(50))
|
||||
if(status && CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_danger("You accidentally hit yourself with the [src]!"))
|
||||
user.Weaken(30)
|
||||
deductcharge(hitcost)
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
pickup_sound = 'sound/items/pickup/crowbar.ogg'
|
||||
|
||||
/obj/item/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_warning("You club yourself over the head."))
|
||||
user.Weaken(3 * force)
|
||||
if(ishuman(user))
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
/obj/item/melee/telebaton/attack(mob/target as mob, mob/living/user as mob)
|
||||
if(on)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_warning("You club yourself over the head."))
|
||||
user.Weaken(3 * force)
|
||||
if(ishuman(user))
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
return ..()
|
||||
if(user.zone_sel.selecting != O_EYES && user.zone_sel.selecting != BP_HEAD)
|
||||
return ..()
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_HARM_CHANCE(user))
|
||||
M = user
|
||||
return eyestab(M,user)
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
sleep(rand(2,4))
|
||||
|
||||
|
||||
if((CLUMSY in user.mutations) && prob(50)) //What if he's a clown?
|
||||
if(CLUMSY_FAIL_CHANCE(user)) //What if he's a clown?
|
||||
to_chat(M, span_warning("You accidentally slam yourself with the [src]!"))
|
||||
M.Weaken(1)
|
||||
user.take_organ_damage(2)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
to_chat(user, span_danger("You don't have the dexterity to do this!"))
|
||||
return
|
||||
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_HARM_CHANCE(user))
|
||||
to_chat(user, span_danger("The rod slips out of your hand and hits your head."))
|
||||
user.take_organ_damage(10)
|
||||
user.Paralyse(20)
|
||||
|
||||
Reference in New Issue
Block a user