mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-18 06:01:56 +00:00
Adds holster, lighter, and seatbelt sounds from World Server.
This commit is contained in:
@@ -120,6 +120,7 @@
|
|||||||
// step_towards(M, src)
|
// step_towards(M, src)
|
||||||
|
|
||||||
. = buckle_mob(M, forced)
|
. = buckle_mob(M, forced)
|
||||||
|
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
|
||||||
if(.)
|
if(.)
|
||||||
if(!silent)
|
if(!silent)
|
||||||
if(M == user)
|
if(M == user)
|
||||||
@@ -135,6 +136,7 @@
|
|||||||
|
|
||||||
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
|
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
|
||||||
var/mob/living/M = unbuckle_mob(buckled_mob)
|
var/mob/living/M = unbuckle_mob(buckled_mob)
|
||||||
|
playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
|
||||||
if(M)
|
if(M)
|
||||||
if(M != user)
|
if(M != user)
|
||||||
M.visible_message(\
|
M.visible_message(\
|
||||||
|
|||||||
@@ -505,6 +505,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
slot_flags = SLOT_BELT
|
slot_flags = SLOT_BELT
|
||||||
attack_verb = list("burnt", "singed")
|
attack_verb = list("burnt", "singed")
|
||||||
var/base_state
|
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
|
/obj/item/weapon/flame/lighter/zippo
|
||||||
name = "\improper Zippo lighter"
|
name = "\improper Zippo lighter"
|
||||||
@@ -512,6 +514,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
icon = 'icons/obj/zippo.dmi'
|
icon = 'icons/obj/zippo.dmi'
|
||||||
icon_state = "zippo"
|
icon_state = "zippo"
|
||||||
item_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
|
/obj/item/weapon/flame/lighter/random
|
||||||
New()
|
New()
|
||||||
@@ -526,6 +530,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
lit = 1
|
lit = 1
|
||||||
icon_state = "[base_state]on"
|
icon_state = "[base_state]on"
|
||||||
item_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) )
|
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>")
|
user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
|
||||||
else
|
else
|
||||||
@@ -545,6 +550,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
|||||||
lit = 0
|
lit = 0
|
||||||
icon_state = "[base_state]"
|
icon_state = "[base_state]"
|
||||||
item_state = "[base_state]"
|
item_state = "[base_state]"
|
||||||
|
playsound(src.loc, deactivation_sound, 75, 1)
|
||||||
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
|
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>")
|
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
|
else
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
|
slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
|
||||||
concealed_holster = 1
|
concealed_holster = 1
|
||||||
var/obj/item/holstered = null
|
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)
|
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
|
||||||
if(holstered && istype(user))
|
if(holstered && istype(user))
|
||||||
@@ -15,6 +17,9 @@
|
|||||||
to_chat(user, "<span class='warning'>[I] won't fit in [src]!</span>")
|
to_chat(user, "<span class='warning'>[I] won't fit in [src]!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if(holster_in)
|
||||||
|
playsound(get_turf(src), holster_in, 50)
|
||||||
|
|
||||||
if(istype(user))
|
if(istype(user))
|
||||||
user.stop_aiming(no_message=1)
|
user.stop_aiming(no_message=1)
|
||||||
holstered = I
|
holstered = I
|
||||||
@@ -36,7 +41,9 @@
|
|||||||
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
|
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>")
|
to_chat(user, "<span class='warning'>You need an empty hand to draw \the [holstered]!</span>")
|
||||||
else
|
else
|
||||||
|
var/sound_vol = 25
|
||||||
if(user.a_intent == I_HURT)
|
if(user.a_intent == I_HURT)
|
||||||
|
sound_vol = 50
|
||||||
usr.visible_message(
|
usr.visible_message(
|
||||||
"<span class='danger'>[user] draws \the [holstered], ready to shoot!</span>",
|
"<span class='danger'>[user] draws \the [holstered], ready to shoot!</span>",
|
||||||
"<span class='warning'>You draw \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'>[user] draws \the [holstered], pointing it at the ground.</span>",
|
||||||
"<span class='notice'>You draw \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)
|
user.put_in_hands(holstered)
|
||||||
holstered.add_fingerprint(user)
|
holstered.add_fingerprint(user)
|
||||||
w_class = initial(w_class)
|
w_class = initial(w_class)
|
||||||
|
|||||||
BIN
sound/effects/seatbelt.ogg
Normal file
BIN
sound/effects/seatbelt.ogg
Normal file
Binary file not shown.
BIN
sound/items/holsterin.ogg
Normal file
BIN
sound/items/holsterin.ogg
Normal file
Binary file not shown.
BIN
sound/items/holsterout.ogg
Normal file
BIN
sound/items/holsterout.ogg
Normal file
Binary file not shown.
BIN
sound/items/lighter_off.ogg
Normal file
BIN
sound/items/lighter_off.ogg
Normal file
Binary file not shown.
BIN
sound/items/lighter_on.ogg
Normal file
BIN
sound/items/lighter_on.ogg
Normal file
Binary file not shown.
BIN
sound/items/zippo_off.ogg
Normal file
BIN
sound/items/zippo_off.ogg
Normal file
Binary file not shown.
BIN
sound/items/zippo_on.ogg
Normal file
BIN
sound/items/zippo_on.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user