mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 03:27:46 +01:00
Reduce Clumsy Gene's Obnoxious RNG (#19126)
* clumsy rng * seperate define for this too * there are very harmful too * replace with macros * fixed handling --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -57,7 +57,7 @@
|
||||
if(!armed)
|
||||
to_chat(user, span_notice("You arm [src]."))
|
||||
else
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_FAIL_CHANCE(user))
|
||||
var/which_hand = BP_L_HAND
|
||||
if(!user.hand)
|
||||
which_hand = BP_R_HAND
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
/obj/item/assembly/mousetrap/attack_hand(var/mob/living/user)
|
||||
if(armed)
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_FAIL_CHANCE(user))
|
||||
var/which_hand = BP_L_HAND
|
||||
if(!user.hand)
|
||||
which_hand = BP_R_HAND
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
|
||||
activation_message="You feel lightheaded."
|
||||
primitive_expression_messages=list("trips.")
|
||||
mutation = CLUMSY
|
||||
|
||||
/datum/trait/negative/disability_coprolalia
|
||||
name = "Coprolalia"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
user.show_message(span_blue("[mode ? "Toggled to cyborg analyzing mode." : "Toggled to cyborg upgrade scan mode."]"), 1)
|
||||
|
||||
/obj/item/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob)
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_FAIL_CHANCE(user))
|
||||
to_chat(user, span_red("You try to analyze the floor's vitals!"))
|
||||
for(var/mob/O in viewers(M, null))
|
||||
O.show_message(span_red(text("[user] has analyzed the floor's vitals!")), 1)
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if((CLUMSY in usr.mutations) && prob(50))
|
||||
if(CLUMSY_FAIL_CHANCE(usr))
|
||||
to_chat(usr, span_warning("You cut yourself on the paper."))
|
||||
return
|
||||
var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN, encode = FALSE), MAX_NAME_LEN)
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
if(HULK in M.mutations)
|
||||
to_chat(M, span_danger("Your fingers are much too large for the trigger guard!"))
|
||||
return FALSE
|
||||
if((CLUMSY in M.mutations) && prob(40)) //Clumsy handling
|
||||
if(CLUMSY_HARM_CHANCE(M)) //Clumsy handling
|
||||
var/obj/P = consume_next_projectile()
|
||||
if(P)
|
||||
if(process_projectile(P, user, user, pick(BP_L_FOOT, BP_R_FOOT)))
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
if(.)
|
||||
return TRUE
|
||||
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_themselves()] with \the [src]."),\
|
||||
span_danger("You accidentally cut yourself with \the [src]."))
|
||||
user.take_organ_damage(5,5)
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
return
|
||||
|
||||
if(user.a_intent == I_HURT && ismob(target))
|
||||
if((CLUMSY in user.mutations) && prob(50))
|
||||
if(CLUMSY_HARM_CHANCE(user))
|
||||
target = user
|
||||
syringestab(target, user)
|
||||
return
|
||||
|
||||
@@ -1089,7 +1089,7 @@
|
||||
if(.)
|
||||
return TRUE
|
||||
if (active)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
if (CLUMSY_HARM_CHANCE(user))
|
||||
user.visible_message(span_danger("\The [user] accidentally cuts \himself with \the [src]."),\
|
||||
span_danger("You accidentally cut yourself with \the [src]."))
|
||||
user.take_organ_damage(5,5)
|
||||
|
||||
Reference in New Issue
Block a user