cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from SkyMarshal/159ce32cc7ed547c2004fcc260c16282a415afbc

Browse Source 
Too long for the title, check the description
This commit is contained in:
Albert Iordache
2011-12-17 01:27:00 -08:00
parent daaae0d298 159ce32cc7
commit d8d876681e
7 changed files with 100 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/mops_cleaners.dm
+38 -6
View File
@@ -13,11 +13,25 @@ MOP
/obj/item/weapon/cleaner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
/obj/item/weapon/cleaner/attack_self(var/mob/user as mob)
switch(catch)
if(0)
user << "\blue You flip the safety back on."
catch = 1
return
if(1)
user << "\blue You flip the safety off."
catch = 0
return
/obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob)
if (istype(A, /obj/item/weapon/storage ))
return
if (istype(A, /obj/effect/proc_holder/spell ))
return
else if (catch == 1)
user << "\blue The safety is on!"
return
else if (src.reagents.total_volume < 1)
user << "\blue [src] is empty!"
return
@@ -174,15 +188,33 @@ MOP
/obj/item/weapon/pepperspray/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
/obj/item/weapon/pepperspray/attack_self(var/mob/user as mob)
switch(catch)
if(0)
user << "\blue You flip the safety on."
catch = 1
return
if(1)
user << "\blue You flip the safety off."
catch = 0
return
/obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob)
if (istype(A, /obj/item/weapon/storage ))
return
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)
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 (catch == 1)
user << "\blue The safety is on!"
return
else if (src.reagents.total_volume < 1)
user << "\blue [src] is empty!"
@@ -195,8 +227,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
@@ -255,7 +287,7 @@ MOP
/obj/item/weapon/pepperspray/examine()
set src in usr
usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
usr << text("\icon[] [] units of pepperspray left!", src, src.reagents.total_volume)
..()
return