From 79ad7d1ae90ecbe6dc7c313efea6c1aa87b9338b Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 15 Dec 2011 20:34:36 -0700 Subject: [PATCH] Should improve pepper spray, and remove coolness check on detective's revolver --- code/game/objects/items/weapons/mops_cleaners.dm | 16 ++++++++++------ code/modules/chemical/Chemistry-Reagents.dm | 8 ++++---- .../projectiles/guns/projectile/revolver.dm | 5 +++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index c6e2c98eabd..d1e81e6d614 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -180,10 +180,14 @@ MOP if (istype(A, /obj/effect/proc_holder/spell )) return else if (istype(A, /obj/structure/reagent_dispensers/peppertank) && get_dist(src,A) <= 1) - A.reagents.trans_to(src, 45) - user << "\blue Pepper spray refilled" - playsound(src.loc, 'refill.ogg', 50, 1, -6) - return + if(src.reagents.total_volume < 45) + A.reagents.trans_to(src, 45 - src.reagents.total_volume) + user << "\blue Pepper spray refilled" + playsound(src.loc, 'refill.ogg', 50, 1, -6) + return + else + user << "\blue Pepper spray is already full!" + return else if (src.reagents.total_volume < 1) user << "\blue [src] is empty!" return @@ -195,8 +199,8 @@ MOP var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src)) D.name = "chemicals" D.icon = 'chempuff.dmi' - D.create_reagents(15) - src.reagents.trans_to(D, 15) + D.create_reagents(5) + src.reagents.trans_to(D, 5) var/rgbcolor[3] var/finalcolor diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index a37bee8cce1..fa3ee20e83d 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1711,13 +1711,13 @@ datum if(M:glasses) M << "\red Your glasses protect you from most of the pepperspray!" M:emote("scream") - M.eye_blurry = max(M.eye_blurry, 1) + M.eye_blurry = max(M.eye_blurry, 2) return M:emote("scream") M << "\red You're sprayed directly in the eyes with pepperspray!" - M.eye_blurry = max(M.eye_blurry, 5) - M.eye_blind = max(M.eye_blind, 2) - M:paralysis = max(M:paralysis, 1) + M.eye_blurry = max(M.eye_blurry, 10) + M.eye_blind = max(M.eye_blind, 4) + M:paralysis = max(M:paralysis, 2) M.drop_item() frostoil diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index b0793442b5b..4a80978d786 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -8,11 +8,12 @@ special_check(var/mob/living/carbon/human/M) - if(ishuman(M)) +/* if(ishuman(M)) if(istype(M.w_uniform, /obj/item/clothing/under/det) && istype(M.head, /obj/item/clothing/head/det_hat) && istype(M.wear_suit, /obj/item/clothing/suit/det_suit)) return 1 M << "\red You just don't feel cool enough to use this gun looking like that." - return 0 + return 0 */ + return 1 verb/rename_gun()