Made clumsiness into disability

I really dont want to make clumsy_act()
This commit is contained in:
Razharas
2014-12-14 08:04:48 +03:00
parent 44cc6c6d97
commit 21a2c2d21e
18 changed files with 30 additions and 22 deletions

View File

@@ -13,10 +13,10 @@
#define MUTE 2
#define DEAF 4
#define NEARSIGHT 8
#define VISIONBLOCK 16
#define FAT 32
#define HUSK 64
#define NOCLONE 128
#define CLUMSY 256
// bitflags for machine stat variable
#define BROKEN 1

View File

@@ -238,6 +238,14 @@
name = "Clumsiness"
quality = MINOR_NEGATIVE
/datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner)
if(..()) return
owner.disabilities |= CLUMSY
/datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
if(..()) return
owner.disabilities &= ~CLUMSY
/datum/mutation/human/tourettes
name = "Tourettes Syndrome"

View File

@@ -16,7 +16,7 @@
/obj/item/device/flash/proc/clown_check(mob/living/carbon/human/user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
flash_carbon(user, user, 15, 0)
return 0
return 1

View File

@@ -49,7 +49,7 @@
add_fingerprint(user)
if(on && user.zone_sel.selecting == "eyes")
if(((istype(user) && user.dna.check_mutation("Clumsiness", user)) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
if((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
if(!user.IsAdvancedToolUser())

View File

@@ -80,7 +80,7 @@ MASS SPECTROMETER
/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/carbon/human/user as mob)
// Clumsiness/brain damage check
if ((istype(user) && user.dna.check_mutation("Clumsiness", user) || user.getBrainLoss() >= 60) && prob(50))
if ((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50))
user << "<span class='notice'>You stupidly try to analyze the floor's vitals!</span>"
user.visible_message("<span class='warning'>[user] has analyzed the floor's vitals!</span>")
user.show_message("<span class='notice'>Analyzing Results for The floor:\n\t Overall Status: Healthy", 1)

View File

@@ -14,7 +14,7 @@
var/display_timer = 1
/obj/item/weapon/grenade/proc/clown_check(var/mob/living/carbon/human/user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>Huh? How does this thing work?</span>"
active = 1
icon_state = initial(icon_state) + "_active"

View File

@@ -19,7 +19,7 @@
var/trashtype = null //for disposable cuffs
/obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>Uh... how do those things work?!</span>"
apply_cuffs(user,user)

View File

@@ -66,7 +66,7 @@
src.icon_state = "fork"
return
else
if(ishuman(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
M = user
return eyestab(M,user)
@@ -87,7 +87,7 @@
return (BRUTELOSS)
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/carbon/human/user)
if (istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if (user.disabilities & CLUMSY && prob(50))
user << "<span class='danger'> You accidentally cut yourself with the [src].</span>"
user.take_organ_damage(20)
return

View File

@@ -68,7 +68,7 @@
return 0
/obj/item/weapon/melee/energy/sword/attack_self(mob/living/carbon/human/user)
if (istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if (user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>"
user.take_organ_damage(5,5)
active = !active

View File

@@ -29,7 +29,7 @@
/obj/item/weapon/melee/classic_baton/attack(mob/M, mob/living/carbon/human/user)
add_fingerprint(user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>You club yourself over the head!</span>"
user.Weaken(3 * force)
if(ishuman(user))
@@ -103,7 +103,7 @@
/obj/item/weapon/melee/telebaton/attack(mob/target, mob/living/carbon/human/user)
if(on)
add_fingerprint(user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
user << "<span class ='danger'>You club yourself over the head.</span>"
user.Weaken(3 * force)
if(ishuman(user))

View File

@@ -57,7 +57,7 @@
return (active)
/obj/item/weapon/shield/energy/attack_self(mob/living/carbon/human/user)
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
user << "<span class='warning'>You beat yourself in the head with [src].</span>"
user.take_organ_damage(5)
active = !active

View File

@@ -60,7 +60,7 @@
user.take_organ_damage(0,10)
return
if (istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if (user.disabilities & CLUMSY && prob(50))
user << "<span class='danger'>The [src] slips out of your hand and hits your head.</span>"
user.take_organ_damage(10)
user.Paralyse(20)

View File

@@ -101,7 +101,7 @@
add_fingerprint(user)
/obj/item/weapon/melee/baton/attack(mob/M, mob/living/carbon/human/user)
if(status && istype(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(status && user.disabilities & CLUMSY && prob(50))
user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
user.Weaken(stunforce*3)

View File

@@ -86,7 +86,7 @@
if(!istype(M)) return ..()
if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
return ..()
if(ishuman(user) && user.dna.check_mutation("Clumsiness", user) && prob(50))
if(user.disabilities & CLUMSY && prob(50))
M = user
return eyestab(M,user)

View File

@@ -214,7 +214,7 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/carbon/human/user as mob)
..()
if(istype(user) && user.dna.check_mutation("Clumsiness", user) && (wielded) && prob(40))
if(user.disabilities & CLUMSY && (wielded) && prob(40))
impale(user)
return
if((wielded) && prob(50))

View File

@@ -18,7 +18,7 @@
if(!armed)
if(ishuman(usr))
var/mob/living/carbon/human/user = usr
if((user.getBrainLoss() >= 60) || (ishuman(user) && user.dna.check_mutation("Clumsiness", user)) && prob(50))
if((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY && prob(50))
user << "Your hand slips, setting off the trigger."
pulse(0)
update_icon()
@@ -69,7 +69,7 @@
if(!armed)
user << "<span class='notice'>You arm [src].</span>"
else
if(((user.getBrainLoss() >= 60) || (istype(user) && user.dna.check_mutation("Clumsiness", user))) && prob(50))
if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50))
var/which_hand = "l_hand"
if(!user.hand)
which_hand = "r_hand"
@@ -85,7 +85,7 @@
/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user as mob)
if(armed)
if(((user.getBrainLoss() >= 60) || (istype(user) && user.dna.check_mutation("Clumsiness", user))) && prob(50))
if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50))
var/which_hand = "l_hand"
if(!user.hand)
which_hand = "r_hand"

View File

@@ -72,7 +72,7 @@
if(!ishuman(usr))
return
var/mob/living/carbon/human/H = usr
if(H.dna.check_mutation("Clumsiness", H) && prob(25))
if(H.disabilities & CLUMSY && prob(25))
H << "<span class='warning'>You cut yourself on the paper! Ahhhh! Ahhhhh!</span>"
H.damageoverlaytemp = 9001
return
@@ -274,7 +274,7 @@
return
var/clown = 0
if(istype(user) && user.dna.check_mutation("Clumsiness", user))
if(user.disabilities & CLUMSY)
clown = 1
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))

View File

@@ -63,7 +63,7 @@
//Exclude lasertag guns from the CLUMSY check.
if(clumsy_check)
if((istype(user) && user.dna.check_mutation("Clumsiness", user)) && prob(40))
if(user.disabilities & CLUMSY && prob(40))
user << "<span class='danger'>You shoot yourself in the foot with \the [src]!</span>"
afterattack(user, user)
user.drop_item()