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

Adds holster, lighter, and seatbelt sounds from World Server.

Browse Source
This commit is contained in:
lemon
2020-02-22 10:21:23 -05:00
parent 3c872fc93c
commit 828547b964
10 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/buckling.dm
View File

@@ -120,6 +120,7 @@
// step_towards(M, src)
. = buckle_mob(M, forced)
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
if(.)
if(!silent)
if(M == user)
@@ -135,6 +136,7 @@
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
var/mob/living/M = unbuckle_mob(buckled_mob)
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
if(M)
if(M != user)
M.visible_message(\

6
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -505,6 +505,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed")
var/base_state
var/activation_sound = 'sound/items/lighter_on.ogg'
var/deactivation_sound = 'sound/items/lighter_off.ogg'
/obj/item/weapon/flame/lighter/zippo
name = "\improper Zippo lighter"
@@ -512,6 +514,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/zippo.dmi'
icon_state = "zippo"
item_state = "zippo"
activation_sound = 'sound/items/zippo_on.ogg'
deactivation_sound = 'sound/items/zippo_off.ogg'
/obj/item/weapon/flame/lighter/random
New()
@@ -526,6 +530,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 1
icon_state = "[base_state]on"
item_state = "[base_state]on"
playsound(src.loc, activation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
else
@@ -545,6 +550,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = "[base_state]"
item_state = "[base_state]"
playsound(src.loc, deactivation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.</span>")
else

11
code/modules/clothing/under/accessories/holster.dm
View File

@@ -5,6 +5,8 @@
slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
concealed_holster = 1
var/obj/item/holstered = null
var/holster_in = 'sound/items/holsterin.ogg'
var/holster_out = 'sound/items/holsterout.ogg'
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
if(holstered && istype(user))
@@ -15,6 +17,9 @@
to_chat(user, "<span class='warning'>[I] won't fit in [src]!</span>")
return
if(holster_in)
playsound(get_turf(src), holster_in, 50)
if(istype(user))
user.stop_aiming(no_message=1)
holstered = I
@@ -36,7 +41,9 @@
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
to_chat(user, "<span class='warning'>You need an empty hand to draw \the [holstered]!</span>")
else
var/sound_vol = 25
if(user.a_intent == I_HURT)
sound_vol = 50
usr.visible_message(
"<span class='danger'>[user] draws \the [holstered], ready to shoot!</span>",
"<span class='warning'>You draw \the [holstered], ready to shoot!</span>"
@@ -46,6 +53,10 @@
"<span class='notice'>[user] draws \the [holstered], pointing it at the ground.</span>",
"<span class='notice'>You draw \the [holstered], pointing it at the ground.</span>"
)
if(holster_out)
playsound(get_turf(src), holster_out, sound_vol)
user.put_in_hands(holstered)
holstered.add_fingerprint(user)
w_class = initial(w_class)