cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 11:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7777 from Verkister/patch-58

Browse Source 
Modular honks
This commit is contained in:
Atermonera
2020-12-07 16:10:05 -09:00
committed by GitHub
parent 289dfbdb81 77123be953
commit d200fd5d63
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/items/weapons/clown_items.dm
View File

@@ -6,12 +6,12 @@
*/
/*
* Banana Peals
* Banana Peels
*/
/obj/item/weapon/bananapeel/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if (istype(AM, /mob/living))
if(istype(AM, /mob/living))
var/mob/living/M = AM
M.slip("the [src.name]",4)
/*
@@ -28,7 +28,7 @@
/obj/item/weapon/soap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if (istype(AM, /mob/living))
if(istype(AM, /mob/living))
var/mob/living/M = AM
M.slip("the [src.name]",3)
@@ -68,11 +68,20 @@
/*
* Bike Horns
*/
/obj/item/weapon/bikehorn
var/honk_sound = 'sound/items/bikehorn.ogg'
/obj/item/weapon/bikehorn/attack_self(mob/user as mob)
if (spam_flag == 0)
if(spam_flag == 0)
spam_flag = 1
playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
playsound(src, honk_sound, 50, 1)
src.add_fingerprint(user)
spawn(20)
spam_flag = 0
return
/obj/item/weapon/bikehorn/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
return
if(istype(AM, /mob/living))
playsound(src, honk_sound, 50, 1)