cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-22 20:47:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-10-16 22:52:41 +02:00
parent 2d2e1a9d46 d92e5d3e28
commit dc36fe9b8f
501 changed files with 22581 additions and 19177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/instruments/instrument_data/_instrument_data.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/// Category
var/category = "Unsorted"
/// Used for categorization subtypes
var/abstract_type = /datum/instrument
var/instrument_type = /datum/instrument
/// Write here however many samples, follow this syntax: "%note num%"='%sample file%' eg. "27"='synthesizer/e2.ogg'. Key must never be lower than 0 and higher than 127
var/list/real_samples
/// assoc list key = /datum/instrument_key. do not fill this yourself!
code/modules/instruments/instrument_data/brass.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/brass
name = "Generic brass instrument"
category = "Brass"
abstract_type = /datum/instrument/brass
instrument_type = /datum/instrument/brass
/datum/instrument/brass/crisis_section
name = "Crisis Brass Section"
code/modules/instruments/instrument_data/chromatic_percussion.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/chromatic
name = "Generic chromatic percussion instrument"
category = "Chromatic percussion"
abstract_type = /datum/instrument/chromatic
instrument_type = /datum/instrument/chromatic
/datum/instrument/chromatic/vibraphone1
name = "Crisis Vibraphone"
code/modules/instruments/instrument_data/fun.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/fun
name = "Generic Fun Instrument"
category = "Fun"
abstract_type = /datum/instrument/fun
instrument_type = /datum/instrument/fun
/datum/instrument/fun/honk
name = "!!HONK!!"
code/modules/instruments/instrument_data/guitar.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/guitar
name = "Generic guitar-like instrument"
category = "Guitar"
abstract_type = /datum/instrument/guitar
instrument_type = /datum/instrument/guitar
/datum/instrument/guitar/steel_crisis
name = "Crisis Steel String Guitar"
code/modules/instruments/instrument_data/hardcoded.dm
+1 -1
View File
@@ -2,7 +2,7 @@
//SONGS WILL BE AUTOMATICALLY SWITCHED TO LEGACY MODE IF THEY USE THIS KIND OF INSTRUMENT!
//I'd prefer these stayed. They sound different from the mechanical synthesis of synthed instruments, and I quite like them that way. It's not legacy, it's hardcoded, old style. - kevinz000
/datum/instrument/hardcoded
abstract_type = /datum/instrument/hardcoded
instrument_type = /datum/instrument/hardcoded
category = "Non-Synthesized"
instrument_flags = INSTRUMENT_LEGACY
volume_multiplier = 1 //not as loud as synth'd
code/modules/instruments/instrument_data/organ.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/organ
name = "Generic organ"
category = "Organ"
abstract_type = /datum/instrument/organ
instrument_type = /datum/instrument/organ
/datum/instrument/organ/crisis_church
name = "Crisis Church Organ"
code/modules/instruments/instrument_data/piano.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/piano
name = "Generic piano"
category = "Piano"
abstract_type = /datum/instrument/piano
instrument_type = /datum/instrument/piano
/datum/instrument/piano/fluid_piano
name = "FluidR3 Grand Piano"
code/modules/instruments/instrument_data/synth_tones.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/instrument/tones
name = "Ideal tone"
category = "Tones"
abstract_type = /datum/instrument/tones
instrument_type = /datum/instrument/tones
/datum/instrument/tones/square_wave
name = "Ideal square wave"