Should improve pepper spray, and remove coolness check on detective's revolver

This commit is contained in:
SkyMarshal
2011-12-15 20:34:36 -07:00
parent 6a7223ce58
commit 79ad7d1ae9
3 changed files with 17 additions and 12 deletions
@@ -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
+4 -4
View File
@@ -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
@@ -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()