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

Clown FIX: Adds the clown recorder (#19710)

Browse Source 
* Adds the clown recorder

* added item action

* Defining cooldown

* cmag define

* Update code/game/objects/items/weapons/clown_items.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* added a second laugh

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Henri215
2022-11-20 23:13:52 +01:00
committed by GitHub
co-authored by Sirryan2002
parent 9177c2014c
commit a7864e6e9a
6 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/clown_items.dm
+37
View File
@@ -61,3 +61,40 @@
if(!H.can_hear())
continue
M.emote("flip")
#define LAUGH_COOLDOWN 30 SECONDS
#define LAUGH_COOLDOWN_CMAG 10 SECONDS
/obj/item/clown_recorder
name = "clown recorder"
desc = "When you just can't get those laughs coming the natural way!"
icon = 'icons/obj/device.dmi'
icon_state = "clown_recorder"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
actions_types = list(/datum/action/item_action/laugh_track)
var/cooldown = 0
/obj/item/clown_recorder/attack_self(mob/user)
if(cooldown > world.time)
to_chat(user, "<span class='notice'>The tape is still winding back.</span>")
return
playsound(src, pick('sound/voice/sitcom_laugh.ogg', 'sound/voice/sitcom_laugh2.ogg'), 50, FALSE)
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
cooldown = world.time + LAUGH_COOLDOWN
else
cooldown = world.time + LAUGH_COOLDOWN_CMAG
/obj/item/clown_recorder/cmag_act(mob/user)
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
to_chat(user, "<span class='notice'>Winding back speed has been improved by the bananium ooze!</span>")
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
#undef LAUGH_COOLDOWN
#undef LAUGH_COOLDOWN_CMAG
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+1
View File
@@ -10,6 +10,7 @@
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/clown_recorder(src)
new /obj/item/bikehorn(src)
new /obj/item/reagent_containers/spray/waterflower(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)