diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 7c76f4391102..d373a96e6013 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -126,4 +126,4 @@ return 1 else if(istype(W, /turf/simulated/wall)) return 1 - return 0 \ No newline at end of file + return 0 diff --git a/maps/crux/crux.dm b/maps/crux/crux.dm index fec531c93337..3466eff22657 100644 --- a/maps/crux/crux.dm +++ b/maps/crux/crux.dm @@ -3,25 +3,14 @@ #include "../../mods/crux/_crux.dme" #include "../../mods/content/mundane.dm" - #include "../../mods/content/bigpharma/_bigpharma.dme" #include "../../mods/content/corporate/_corporate.dme" #include "../../mods/content/government/_government.dme" #include "../../mods/content/modern_earth/_modern_earth.dme" #include "../../mods/content/mouse_highlights/_mouse_highlight.dme" - #include "../../mods/content/psionics/_psionics.dme" #include "../../mods/content/scaling_descriptors.dm" #include "../../mods/content/xenobiology/_xenobiology.dme" #include "../../mods/content/matchmaking/_matchmaking.dme" - - #include "../../mods/mobs/dionaea/_dionaea.dme" - #include "../../mods/mobs/borers/_borers.dme" - - #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/serpentid/_serpentid.dme" #include "../../mods/species/utility_frames/_utility_frames.dme" - #include "../../mods/species/neoavians/_neoavians.dme" - #include "../../mods/species/bayliens/_bayliens.dme" - #include "../../mods/species/vox/_vox.dme" #include "datum/turbolifts.dm" diff --git a/mods/crux/_crux.dme b/mods/crux/_crux.dme index e04593f76857..f959816dfe3a 100644 --- a/mods/crux/_crux.dme +++ b/mods/crux/_crux.dme @@ -10,4 +10,5 @@ #include "species/tza/organs.dm" #include "species/tza/pheremones.dm" #include "species/tza/species.dm" +#include "turfs/shuttle.dm" #endif diff --git a/mods/crux/turfs/shuttle.dm b/mods/crux/turfs/shuttle.dm new file mode 100644 index 000000000000..e11f9cc57935 --- /dev/null +++ b/mods/crux/turfs/shuttle.dm @@ -0,0 +1,4 @@ +/turf/simulated/floor/nakhayl + color = COLOR_PURPLE + icon_state = "jaggy" + icon = 'icons/turf/flooring/alium.dmi' diff --git a/mods/species/ascent/_ascent.dme b/mods/species/ascent/_ascent.dme index a8bf66e1a9cc..656e7ce80d76 100644 --- a/mods/species/ascent/_ascent.dme +++ b/mods/species/ascent/_ascent.dme @@ -8,7 +8,6 @@ #include "datum\aspects.dm" #include "datum\codex.dm" #include "datum\culture.dm" -#include "datum\descriptors.dm" #include "datum\emotes.dm" #include "datum\languages.dm" #include "datum\species.dm" diff --git a/mods/species/ascent/datum/descriptors.dm b/mods/species/vox/datum/descriptor_body_length.dm similarity index 96% rename from mods/species/ascent/datum/descriptors.dm rename to mods/species/vox/datum/descriptor_body_length.dm index a7eb571cb5c1..ee6eaaf0752f 100644 --- a/mods/species/ascent/datum/descriptors.dm +++ b/mods/species/vox/datum/descriptor_body_length.dm @@ -25,4 +25,4 @@ return "Your body is" /datum/appearance_descriptor/body_length/get_third_person_message_start(var/decl/pronouns/my_gender) - return "[my_gender.His] body is" \ No newline at end of file + return "[my_gender.His] body is" diff --git a/nebula.dme b/nebula.dme index e19703277188..02ca20b289e9 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3736,5 +3736,6 @@ #include "maps\~mapsystem\maps_unit_testing.dm" #include "maps\~unit_tests\unit_testing.dm" #include "mods\_modpack.dm" +#include "mods\species\vox\datum\descriptor_body_length.dm" #include "~code\global_init.dm" // END_INCLUDE