mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
Piano broken sprite, helper, and hit sound (#68003)
* Does the PR * fixes playsound locations
This commit is contained in:
@@ -849,9 +849,7 @@
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/stone,
|
||||
/area/ruin/space/has_grav/hotel/bar)
|
||||
"id" = (
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
/turf/open/floor/holofloor/beach,
|
||||
/area/ruin/space/has_grav/powered/aesthetic)
|
||||
"i" = (
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/structure/window{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -725,7 +725,6 @@
|
||||
/obj/structure/cable,
|
||||
/obj/structure/musician/piano{
|
||||
desc = "Very theatrical.";
|
||||
icon_state = "piano";
|
||||
name = "theatre piano"
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
|
||||
@@ -15876,7 +15876,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/service/theater/abandoned)
|
||||
@@ -48834,7 +48834,7 @@
|
||||
/obj/structure/railing{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -25263,7 +25263,7 @@
|
||||
/obj/effect/turf_decal/siding/thinplating/dark{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/structure/sign/poster/random/directional/north,
|
||||
/turf/open/floor/carpet,
|
||||
/area/station/service/theater)
|
||||
@@ -67974,9 +67974,7 @@
|
||||
/turf/open/floor/iron/freezer,
|
||||
/area/station/commons/toilet)
|
||||
"vmr" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/wood,
|
||||
/area/station/maintenance/port/aft)
|
||||
"vms" = (
|
||||
|
||||
@@ -69445,7 +69445,7 @@
|
||||
/area/station/science/ordnance)
|
||||
"tNO" = (
|
||||
/obj/structure/cable,
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -38005,7 +38005,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/checkpoint/engineering)
|
||||
"nxb" = (
|
||||
/obj/structure/musician/piano,
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
|
||||
@@ -14226,9 +14226,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/centcom/central_command_areas/armory)
|
||||
"Pu" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/misc/beach/sand,
|
||||
/area/centcom/central_command_areas/holding)
|
||||
"Pv" = (
|
||||
|
||||
@@ -69255,9 +69255,7 @@
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/science/lab)
|
||||
"xxP" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/wood,
|
||||
/area/station/service/theater)
|
||||
"xxW" = (
|
||||
|
||||
@@ -160,9 +160,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/shuttle/escape)
|
||||
"aF" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/iron/grimy,
|
||||
/area/shuttle/escape)
|
||||
"aG" = (
|
||||
|
||||
@@ -643,9 +643,7 @@
|
||||
/turf/open/floor/carpet/orange,
|
||||
/area/shuttle/escape/luxury)
|
||||
"ci" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/carpet/green,
|
||||
/area/shuttle/escape/luxury)
|
||||
"cj" = (
|
||||
|
||||
@@ -612,9 +612,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/pirate)
|
||||
"HS" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/obj/machinery/light/directional/west,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/shuttle/pirate)
|
||||
|
||||
@@ -302,9 +302,7 @@
|
||||
},
|
||||
/area/template_noop)
|
||||
"Z" = (
|
||||
/obj/structure/musician/piano{
|
||||
icon_state = "piano"
|
||||
},
|
||||
/obj/structure/musician/piano,
|
||||
/turf/open/floor/holofloor/carpet,
|
||||
/area/template_noop)
|
||||
|
||||
|
||||
@@ -223,3 +223,11 @@
|
||||
/obj/structure/steam_vent = 50,
|
||||
/obj/structure/steam_vent/fast = 50,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/structure/musician/piano/random_piano
|
||||
name = "random piano spawner"
|
||||
icon_state = "piano"
|
||||
loot = list(
|
||||
/obj/structure/musician/piano,
|
||||
/obj/structure/musician/piano/minimoog,
|
||||
)
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
name = "Not A Piano"
|
||||
desc = "Something broke, contact coderbus."
|
||||
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_REQUIRES_DEXTERITY
|
||||
integrity_failure = 0.25
|
||||
var/can_play_unanchored = FALSE
|
||||
var/list/allowed_instrument_ids = list("r3grand","r3harpsi","crharpsi","crgrand1","crbright1", "crichugan", "crihamgan","piano")
|
||||
var/datum/song/song
|
||||
@@ -32,22 +33,32 @@
|
||||
return TOOL_ACT_TOOLTYPE_SUCCESS
|
||||
|
||||
/obj/structure/musician/piano
|
||||
name = "space minimoog"
|
||||
name = "space piano"
|
||||
desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
|
||||
icon = 'icons/obj/musician.dmi'
|
||||
icon_state = "minimoog"
|
||||
icon_state = "piano"
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
var/broken_icon_state = "pianobroken"
|
||||
|
||||
/obj/structure/musician/piano/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
|
||||
switch(damage_type)
|
||||
if(BRUTE)
|
||||
playsound(src, 'sound/effects/piano_hit.ogg', 100, TRUE)
|
||||
if(BURN)
|
||||
playsound(src, 'sound/items/welder.ogg', 100, TRUE)
|
||||
|
||||
/obj/structure/musician/piano/atom_break(damage_flag)
|
||||
. = ..()
|
||||
if(!broken)
|
||||
broken = TRUE
|
||||
icon_state = broken_icon_state
|
||||
|
||||
/obj/structure/musician/piano/unanchored
|
||||
anchored = FALSE
|
||||
|
||||
/obj/structure/musician/piano/Initialize(mapload)
|
||||
. = ..()
|
||||
if(prob(50) && icon_state == initial(icon_state))
|
||||
name = "space minimoog"
|
||||
desc = "This is a minimoog, like a space piano, but more spacey!"
|
||||
icon_state = "minimoog"
|
||||
else
|
||||
name = "space piano"
|
||||
desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
|
||||
icon_state = "piano"
|
||||
/obj/structure/musician/piano/minimoog
|
||||
name = "space minimoog"
|
||||
desc = "This is a minimoog, like a space piano, but more spacey!"
|
||||
icon_state = "minimoog"
|
||||
broken_icon_state = "minimoogbroken"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 79 KiB |
Binary file not shown.
Reference in New Issue
Block a user