diff --git a/code/controllers/subsystems/processing/instruments.dm b/code/controllers/subsystems/processing/instruments.dm index 3f305fb8fc1..72770ea39be 100644 --- a/code/controllers/subsystems/processing/instruments.dm +++ b/code/controllers/subsystems/processing/instruments.dm @@ -34,7 +34,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments) /datum/controller/subsystem/processing/instruments/proc/initialize_instrument_data() for(var/datum/instrument/I as anything in subtypesof(/datum/instrument)) - if(initial(I.abstract_type) == I) + if(initial(I.instrument_type) == I) continue I = new I I.Initialize() diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index 7cede360a20..a37d7a2dd9c 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -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! diff --git a/code/modules/instruments/instrument_data/brass.dm b/code/modules/instruments/instrument_data/brass.dm index 7f8f103831f..37cd981aa20 100644 --- a/code/modules/instruments/instrument_data/brass.dm +++ b/code/modules/instruments/instrument_data/brass.dm @@ -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" diff --git a/code/modules/instruments/instrument_data/chromatic_percussion.dm b/code/modules/instruments/instrument_data/chromatic_percussion.dm index cafa9e31edb..3a5bed23966 100644 --- a/code/modules/instruments/instrument_data/chromatic_percussion.dm +++ b/code/modules/instruments/instrument_data/chromatic_percussion.dm @@ -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" diff --git a/code/modules/instruments/instrument_data/fun.dm b/code/modules/instruments/instrument_data/fun.dm index 790abe46473..0b6fc696d87 100644 --- a/code/modules/instruments/instrument_data/fun.dm +++ b/code/modules/instruments/instrument_data/fun.dm @@ -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!!" diff --git a/code/modules/instruments/instrument_data/guitar.dm b/code/modules/instruments/instrument_data/guitar.dm index be7cfbe467b..07532aa8be1 100644 --- a/code/modules/instruments/instrument_data/guitar.dm +++ b/code/modules/instruments/instrument_data/guitar.dm @@ -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" diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm index c770f9569e3..1138fd7d8ce 100644 --- a/code/modules/instruments/instrument_data/hardcoded.dm +++ b/code/modules/instruments/instrument_data/hardcoded.dm @@ -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 diff --git a/code/modules/instruments/instrument_data/organ.dm b/code/modules/instruments/instrument_data/organ.dm index 25da7409980..c8a4c069e39 100644 --- a/code/modules/instruments/instrument_data/organ.dm +++ b/code/modules/instruments/instrument_data/organ.dm @@ -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" diff --git a/code/modules/instruments/instrument_data/piano.dm b/code/modules/instruments/instrument_data/piano.dm index fdd2f6e9382..e8aac71dae8 100644 --- a/code/modules/instruments/instrument_data/piano.dm +++ b/code/modules/instruments/instrument_data/piano.dm @@ -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" diff --git a/code/modules/instruments/instrument_data/synth_tones.dm b/code/modules/instruments/instrument_data/synth_tones.dm index 9ad9250f40d..d3a78a081c7 100644 --- a/code/modules/instruments/instrument_data/synth_tones.dm +++ b/code/modules/instruments/instrument_data/synth_tones.dm @@ -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" diff --git a/vorestation.dme b/vorestation.dme index 45536a7ea30..72d85ba43e0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -304,6 +304,10 @@ #include "code\controllers\subsystems\processing\processing.dm" #include "code\controllers\subsystems\processing\projectiles.dm" #include "code\controllers\subsystems\processing\turfs.dm" +#include "code\core\atom\Transform.dm" +#include "code\core\datum\IsAbstract.dm" +#include "code\core\image\Transform.dm" +#include "code\core\matrix\Transform.dm" #include "code\datums\ai_law_sets.dm" #include "code\datums\ai_law_sets_vr.dm" #include "code\datums\ai_laws.dm"