Merge pull request #17 from MistakeNot4892/mantids

Adding the tza and nakhayl species.

code/_global_vars/lists/objects.dm

@@ -18,5 +18,7 @@ var/global/list/alphabet = list("a","b","c","d","e","f","g","h","i","j","k","l",
 var/global/list/alphabet_capital = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
 /// Numbers 0-9.
 var/global/list/numbers = list("0","1","2","3","4","5","6","7","8","9")
+/// Alphabet a-z minus vowels.
+var/global/list/alphabet_no_vowels = list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","z")
 
 var/global/list/meteor_list = list()

code/game/turfs/simulated/wall_types.dm

@@ -126,4 +126,4 @@
 		return 1
 	else if(istype(W, /turf/simulated/wall))
 		return 1
-	return 0
+	return 0

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"
 

mods/crux/_crux.dm

@@ -1,2 +1,27 @@
+#define SPECIES_TZA   "Tza"
+#define BODYTYPE_TZA  "mantid worker body"
+#define BODY_FLAG_TZA BITFLAG(9)
+
+#define SPECIES_NAKHAYL "Nakhayl"
+#define BODYTYPE_GNOLL  "gnoll body"
+#define BODY_FLAG_GNOLL BITFLAG(10)
+
+#define BP_M_ARM  "m_arm"
+#define BP_M_HAND "midlimb"
+#define BP_M_LEG  "m_leg"
+#define BP_M_FOOT "m_foot"
+
 /decl/modpack/crux_content
 	name = "Crux Content"
+
+/decl/modpack/crux_content/pre_initialize()
+	. = ..()
+	global.all_limb_tags |= BP_M_ARM
+	global.all_limb_tags |= BP_M_HAND
+	global.all_limb_tags |= BP_M_LEG
+	global.all_limb_tags |= BP_M_FOOT
+	global.all_limb_tags_by_depth.Insert(global.all_limb_tags_by_depth.Find(BP_CHEST)+1, BP_M_ARM)
+	global.all_limb_tags_by_depth.Insert(global.all_limb_tags_by_depth.Find(BP_M_ARM)+1, BP_M_HAND)
+	global.all_limb_tags_by_depth.Insert(global.all_limb_tags_by_depth.Find(BP_GROIN)+1, BP_M_LEG)
+	global.all_limb_tags_by_depth.Insert(global.all_limb_tags_by_depth.Find(BP_M_LEG)+1, BP_M_FOOT)
+	global.all_inventory_slots |= BP_M_HAND

mods/crux/_crux.dme

@@ -1,7 +1,20 @@
 #ifndef MODPACK_CRUX
 #define MODPACK_CRUX
+#include "_crux.dm"
 #include "datum/cultures.dm"
 #include "datum/languages.dm"
 #include "datum/species.dm"
-#include "_crux.dm"
+#include "overrides/clothing.dm"
+#include "species/nakhayl/bodytype.dm"
+#include "species/nakhayl/culture.dm"
+#include "species/nakhayl/markings.dm"
+#include "species/nakhayl/organs.dm"
+#include "species/nakhayl/species.dm"
+#include "species/tza/bodytype.dm"
+#include "species/tza/culture.dm"
+#include "species/tza/markings.dm"
+#include "species/tza/organs.dm"
+#include "species/tza/pheremones.dm"
+#include "species/tza/species.dm"
+#include "turfs/shuttle.dm"
 #endif

mods/crux/datum/species.dm

@@ -1,35 +1,3 @@
-/decl/species/mantid
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/adherent
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/skrell
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/tajaran
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/unathi
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/neoavian
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
-/decl/species/serpentid
-	available_cultural_info = list()
-	force_cultural_info     = list()
-
 /decl/species/utility_frame
 	available_cultural_info = list()
 	force_cultural_info     = list()
-
-/decl/species/vox
-	available_cultural_info = list()
-	force_cultural_info     = list()

mods/crux/overrides/clothing.dm

@@ -0,0 +1,71 @@
+/obj/machinery/suit_cycler/Initialize()
+	LAZYDISTINCTADD(available_bodytypes, BODYTYPE_GNOLL)
+	. = ..()
+
+/obj/item/clothing/suit/space/void/merc/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi')
+
+/obj/item/clothing/suit/space/void/swat/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi')
+
+/obj/item/clothing/suit/space/void/engineering/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi')
+
+/obj/item/clothing/suit/space/void/mining/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi')
+
+/obj/item/clothing/suit/space/void/medical/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi')
+
+/obj/item/clothing/suit/space/void/security/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi')
+
+/obj/item/clothing/suit/space/void/atmos/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi')
+
+/obj/item/clothing/suit/space/void/engineering/alt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi')
+
+/obj/item/clothing/suit/space/void/mining/alt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi')
+
+/obj/item/clothing/suit/space/void/medical/alt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi')
+
+/obj/item/clothing/suit/space/void/security/alt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi')
+
+/obj/item/clothing/suit/space/void/atmos/alt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi')
+
+/obj/item/clothing/suit/space/void/engineering/salvage/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi')
+
+/obj/item/clothing/suit/space/void/pilot/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi')
+
+/obj/item/clothing/suit/space/void/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi')
+
+/obj/item/clothing/suit/space/void/wizard/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/wizard/suit.dmi')
+
+/obj/item/clothing/suit/space/void/excavation/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, BODYTYPE_GNOLL, 'mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi')

mods/crux/species/nakhayl/bodytype.dm

@@ -0,0 +1,57 @@
+/decl/bodytype/nakhayl
+	name                 = "humanoid"
+	bodytype_category    = BODYTYPE_GNOLL
+	limb_blend           = ICON_MULTIPLY
+	icon_template        = 'mods/crux/icons/species/nakhayl/template.dmi'
+	icon_base            = 'mods/crux/icons/species/nakhayl/body.dmi'
+	icon_deformed        = 'mods/crux/icons/species/nakhayl/deformed_body.dmi'
+	bandages_icon        = 'icons/mob/bandage.dmi'
+	eye_icon             = 'mods/crux/icons/species/nakhayl/eyes.dmi'
+	lip_icon             = 'mods/crux/icons/species/nakhayl/lips.dmi'
+	health_hud_intensity = 1.75
+	bodytype_flag        = BODY_FLAG_GNOLL
+	appearance_flags     = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
+	base_hair_color      = "#46321c"
+	base_color           = "#ae7d32"
+	base_eye_color       = "#00aa00"
+	default_h_style      = /decl/sprite_accessory/hair/nakhayl/mohawk
+	base_markings        = list(
+		/decl/sprite_accessory/marking/nakhayl/belly      = "#b6b0a8",
+		/decl/sprite_accessory/marking/nakhayl/spots/body = "#1b1207",
+		/decl/sprite_accessory/marking/nakhayl/ears       = "#1b1207"
+	)
+
+	eye_darksight_range                   = 7
+	eye_flash_mod                         = 2
+	eye_blend                             = ICON_MULTIPLY
+	eye_low_light_vision_effectiveness    = 0.15
+	eye_low_light_vision_adjustment_speed = 0.3
+
+	override_limb_types = list(
+		BP_TAIL = /obj/item/organ/external/tail/nakhayl
+	)
+
+
+	cold_level_1 = 200
+	cold_level_2 = 140
+	cold_level_3 = 80
+
+	heat_level_1 = 330
+	heat_level_2 = 380
+	heat_level_3 = 800
+
+	heat_discomfort_level = 294
+	cold_discomfort_level = 230
+	heat_discomfort_strings = list(
+		"Your fur prickles in the heat.",
+		"You feel uncomfortably warm.",
+		"Your overheated skin itches."
+	)
+
+/decl/bodytype/nakhayl/Initialize()
+	equip_adjust = list(
+		slot_glasses_str =   list("[NORTH]" = list(0, 2), "[EAST]" = list(0, 2), "[SOUTH]" = list( 0, 2),  "[WEST]" = list(0, 2)),
+		slot_wear_mask_str = list("[NORTH]" = list(0, 2), "[EAST]" = list(0, 2), "[SOUTH]" = list( 0, 2),  "[WEST]" = list(0, 2)),
+		slot_head_str =      list("[NORTH]" = list(0, 2), "[EAST]" = list(0, 2), "[SOUTH]" = list( 0, 2),  "[WEST]" = list(0, 2))
+	)
+	. = ..()

mods/crux/species/nakhayl/culture.dm

@@ -0,0 +1,11 @@
+/decl/cultural_info/location/crux/nakhayl
+	name = "Nakhayl Homeworld"
+	description = "Placeholder."
+
+/decl/cultural_info/faction/crux/nakhayl
+	name = "Imperial Loyalist"
+	description = "Placeholder."
+
+/decl/cultural_info/culture/crux/nakhayl
+	name = "Gynarchy Citizen"
+	description = "Placeholder."