Revert "rahhhhhh"

This reverts commit 68686f8.

SQL/beestation_schema.sql

@@ -128,7 +128,6 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
 	`feature_ipc_screen` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`feature_ipc_antenna` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`feature_ipc_chassis` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
-	`feature_ipc_chassis_markings` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`feature_ipc_screen_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
 	`feature_ipc_antenna_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
 	`feature_lizard_body_markings` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
@@ -506,7 +505,7 @@ CREATE TABLE IF NOT EXISTS `SS13_schema_revision` (
   `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`major`,`minor`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 4);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 3);
 
 
 

SQL/database_changelog.txt

@@ -1,22 +1,14 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 7.4; The query to update the schema revision table is:
+The latest database version is 7.3; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 4);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 3);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 4);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 3);
 
 In any query remember to add a prefix to the table names if you use one.
 
 
------------------------------------------------------
-Version 7.4, 19 December 2024, by XeonMations
-IPC - Chassis Markings
-
-ALTER TABLE `SS13_characters`
-	ADD COLUMN IF NOT EXISTS `feature_ipc_chassis_markings` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_ipc_chassis`;
-
-
 -----------------------------------------------------
 Version 7.3, 30 April 2024, by XeonMations
 Dionae - Species Addition

code/__DEFINES/subsystems.dm

@@ -20,7 +20,7 @@
   *
   * make sure you add an update to the schema_version stable in the db changelog
   */
-#define DB_MINOR_VERSION 4
+#define DB_MINOR_VERSION 3
 
 
 //! ## Timing subsystem

code/__HELPERS/global_lists.dm

@@ -40,7 +40,6 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis_markings, GLOB.ipc_chassis_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_type, GLOB.insect_type_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_antenna, GLOB.apid_antenna_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_stripes, GLOB.apid_stripes_list)

code/__HELPERS/mobs.dm

@@ -90,8 +90,6 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
 	if(!GLOB.ipc_chassis_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
-	if(!GLOB.ipc_chassis_markings_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis_markings, GLOB.ipc_chassis_markings_list)
 	if(!GLOB.insect_type_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_type, GLOB.insect_type_list)
 	if(!GLOB.apid_antenna_list.len)
@@ -143,7 +141,6 @@
 		"ipc_screen" = pick(GLOB.ipc_screens_list),
 		"ipc_antenna" = pick(GLOB.ipc_antennas_list),
 		"ipc_chassis" = pick(GLOB.ipc_chassis_list),
-		"ipc_chassis_markings" = pick(GLOB.ipc_chassis_markings_list),
 		"insect_type" = pick(GLOB.insect_type_list),
 		"apid_antenna" = pick(GLOB.apid_antenna_list),
 		"apid_stripes" = pick(GLOB.apid_stripes_list),

code/_globalvars/lists/flavor_misc.dm

@@ -52,7 +52,6 @@ GLOBAL_LIST_EMPTY(caps_list)
 GLOBAL_LIST_EMPTY(ipc_screens_list)
 GLOBAL_LIST_EMPTY(ipc_antennas_list)
 GLOBAL_LIST_EMPTY(ipc_chassis_list)
-GLOBAL_LIST_EMPTY(ipc_chassis_markings_list)
 GLOBAL_LIST_EMPTY(insect_type_list)
 GLOBAL_LIST_EMPTY(apid_antenna_list)
 GLOBAL_LIST_EMPTY(apid_stripes_list)

code/modules/client/preferences/entries/character/species_features/ipc.dm

@@ -138,37 +138,3 @@
 
 /datum/preference/choiced/ipc_chassis/apply_to_human(mob/living/carbon/human/target, value)
 	target.dna.features["ipc_chassis"] = value
-
-/datum/preference/choiced/ipc_chassis_markings
-	db_key = "feature_ipc_chassis_markings"
-	preference_type = PREFERENCE_CHARACTER
-	category = PREFERENCE_CATEGORY_FEATURES
-	main_feature_name = "Chassis Markings"
-	should_generate_icons = TRUE
-	relevant_mutant_bodypart = "ipc_chassis_markings"
-
-/datum/preference/choiced/ipc_chassis_markings/init_possible_values()
-	var/list/values = list()
-	var/list/body_parts = list(
-		BODY_ZONE_HEAD,
-		BODY_ZONE_CHEST,
-		BODY_ZONE_L_ARM,
-		BODY_ZONE_R_ARM,
-		BODY_ZONE_PRECISE_L_HAND,
-		BODY_ZONE_PRECISE_R_HAND,
-		BODY_ZONE_L_LEG,
-		BODY_ZONE_R_LEG,
-	)
-	for (var/chassis_name in GLOB.ipc_chassis_markings_list)
-		var/datum/sprite_accessory/chassis = GLOB.ipc_chassis_markings_list[chassis_name]
-		var/datum/universal_icon/icon_with_chassis = uni_icon('icons/effects/effects.dmi', "nothing")
-
-		for (var/body_part in body_parts)
-			icon_with_chassis.blend_icon(uni_icon('icons/mob/species/ipc/bodymarkings.dmi', "[chassis.limbs_id]_[body_part]", dir = SOUTH), ICON_OVERLAY)
-
-		values[chassis.name] = icon_with_chassis
-
-	return values
-
-/datum/preference/choiced/ipc_chassis_markings/apply_to_human(mob/living/carbon/human/target, value)
-	target.dna.features["ipc_chassis_markings"] = value

code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -2529,88 +2529,93 @@
 	icon_state = "who cares fuck you" // In order to pull the chassis correctly, we need AN icon_state(see line 36-39). It doesn't have to be useful, because it isn't used.
 	color_src = 0
 
-/datum/sprite_accessory/ipc_chassis/morpheuscybernetics
-	name = "Morpheus Cyberkinetics"
-	limbs_id = "mcipc"
-
-/datum/sprite_accessory/ipc_chassis/bishopcyberkinetics
-	name = "Bishop Cyberkinetics"
-	limbs_id = "bshipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_morpheuscybernetics
+	name = "Morpheus Cyberkinetics (Custom)"
+	limbs_id = "greyscale_mcipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/bishopcyberkinetics2
-	name = "Bishop Cyberkinetics 2.0"
-	limbs_id = "bs2ipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_bishopcyberkinetics
+	name = "Bishop Cyberkinetics (Custom)"
+	limbs_id = "greyscale_bshipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/hephaestussindustries
-	name = "Hephaestus Industries"
-	limbs_id = "hsiipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_bishopcyberkinetics2
+	name = "Bishop Cyberkinetics 2.0 (Custom)"
+	limbs_id = "greyscale_bs2ipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/hephaestussindustries2
-	name = "Hephaestus Industries 2.0"
-	limbs_id = "hi2ipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_hephaestussindustries
+	name = "Hephaestus Industries (Custom)"
+	limbs_id = "greyscale_hsiipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/shellguardmunitions
-	name = "Shellguard Munitions Standard Series"
-	limbs_id = "sgmipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_hephaestussindustries2
+	name = "Hephaestus Industries 2.0 (Custom)"
+	limbs_id = "greyscale_hi2ipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/wardtakahashimanufacturing
-	name = "Ward-Takahashi Manufacturing"
-	limbs_id = "wtmipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_hellguardmunitions
+	name = "Shellguard Munitions Standard Series (Custom)"
+	limbs_id = "greyscale_sgmipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/xionmanufacturinggroup
-	name = "Xion Manufacturing Group"
-	limbs_id = "xmgipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_wardtakahashimanufacturing
+	name = "Ward-Takahashi Manufacturing (Custom)"
+	limbs_id = "greyscale_wtmipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/xionmanufacturinggroup2
-	name = "Xion Manufacturing Group 2.0"
-	limbs_id = "xm2ipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_xionmanufacturinggroup
+	name = "Xion Manufacturing Group (Custom)"
+	limbs_id = "greyscale_xmgipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis/zenghupharmaceuticals
-	name = "Zeng-Hu Pharmaceuticals"
-	limbs_id = "zhpipc"
+/datum/sprite_accessory/ipc_chassis/greyscale_xionmanufacturinggroup2
+	name = "Xion Manufacturing Group 2.0 (Custom)"
+	limbs_id = "greyscale_xm2ipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis_markings
-	icon = 'icons/mob/species/ipc/bodymarkings.dmi'
-	icon_state = "who cares fuck you" // In order to pull the chassis correctly, we need AN icon_state(see line 36-39). It doesn't have to be useful, because it isn't used.
-	color_src = MUTCOLORS //RAINBOWS AND SUNSHINE
+/datum/sprite_accessory/ipc_chassis/greyscale_zenghupharmaceuticals
+	name = "Zeng-Hu Pharmaceuticals (Custom)"
+	limbs_id = "greyscale_zhpipc"
+	color_src = MUTCOLORS
 
-/datum/sprite_accessory/ipc_chassis_markings/morpheuscybernetics
+/datum/sprite_accessory/ipc_chassis/morpheuscybernetics
 	name = "Morpheus Cyberkinetics"
 	limbs_id = "mcipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/bishopcyberkinetics
+/datum/sprite_accessory/ipc_chassis/bishopcyberkinetics
 	name = "Bishop Cyberkinetics"
 	limbs_id = "bshipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/bishopcyberkinetics2
+/datum/sprite_accessory/ipc_chassis/bishopcyberkinetics2
 	name = "Bishop Cyberkinetics 2.0"
 	limbs_id = "bs2ipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/hephaestussindustries
+/datum/sprite_accessory/ipc_chassis/hephaestussindustries
 	name = "Hephaestus Industries"
 	limbs_id = "hsiipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/hephaestussindustries2
+/datum/sprite_accessory/ipc_chassis/hephaestussindustries2
 	name = "Hephaestus Industries 2.0"
 	limbs_id = "hi2ipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/shellguardmunitions
+/datum/sprite_accessory/ipc_chassis/shellguardmunitions
 	name = "Shellguard Munitions Standard Series"
 	limbs_id = "sgmipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/wardtakahashimanufacturing
+/datum/sprite_accessory/ipc_chassis/wardtakahashimanufacturing
 	name = "Ward-Takahashi Manufacturing"
 	limbs_id = "wtmipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/xionmanufacturinggroup
+/datum/sprite_accessory/ipc_chassis/xionmanufacturinggroup
 	name = "Xion Manufacturing Group"
 	limbs_id = "xmgipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/xionmanufacturinggroup2
+/datum/sprite_accessory/ipc_chassis/xionmanufacturinggroup2
 	name = "Xion Manufacturing Group 2.0"
 	limbs_id = "xm2ipc"
 
-/datum/sprite_accessory/ipc_chassis_markings/zenghupharmaceuticals
+/datum/sprite_accessory/ipc_chassis/zenghupharmaceuticals
 	name = "Zeng-Hu Pharmaceuticals"
 	limbs_id = "zhpipc"
 

code/modules/mob/living/carbon/human/dummy.dm

@@ -191,8 +191,7 @@ GLOBAL_LIST_EMPTY(dummy_mob_list)
 	target.dna.features["insect_type"] = "fly"
 	target.dna.features["ipc_screen"] = "BSOD"
 	target.dna.features["ipc_antenna"] = "None"
-	target.dna.features["ipc_chassis"] = "Morpheus Cyberkinetics"
-	target.dna.features["ipc_chassis_markings"] = "None"
+	target.dna.features["ipc_chassis"] = "Morpheus Cyberkinetics (Custom)"
 	target.dna.features["psyphoza_cap"] = "Portobello"
 	target.dna.features["diona_leaves"] = "None"
 	target.dna.features["diona_thorns"] = "None"

code/modules/mob/living/carbon/human/species.dm

@@ -906,10 +906,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
 		if(!H.dna.features["ipc_antenna"] || H.dna.features["ipc_antenna"] == "None" || (H.head?.flags_inv & HIDEEARS) || !HD)
 			bodyparts_to_add -= "ipc_antenna"
 
-	if(mutant_bodyparts["ipc_chassis_markings"])
-		if(!H.dna.features["ipc_chassis_markings"] || H.dna.features["ipc_chassis_markings"] == "None" || (H.head?.flags_inv & HIDEJUMPSUIT))
-			bodyparts_to_add -= "ipc_chassis_markings"
-
 	if(mutant_bodyparts["apid_antenna"])
 		if(!H.dna.features["apid_antenna"] || H.dna.features["apid_antenna"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD)
 			bodyparts_to_add -= "apid_antenna"
@@ -1033,8 +1029,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
 					S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
 				if("ipc_chassis")
 					S = GLOB.ipc_chassis_list[H.dna.features["ipc_chassis"]]
-				if("ipc_chassis_markings")
-					S = GLOB.ipc_chassis_markings_list[H.dna.features["ipc_chassis_markings"]]
 				if("insect_type")
 					S = GLOB.insect_type_list[H.dna.features["insect_type"]]
 				if("apid_antenna")

code/modules/mob/living/carbon/human/species_types/IPC.dm

@@ -15,7 +15,7 @@
 	mutantears = /obj/item/organ/ears/robot
 	mutantheart = /obj/item/organ/heart/cybernetic/ipc
 	mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
-	mutant_bodyparts = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics", "ipc_chassis_markings" = "None")
+	mutant_bodyparts = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)")
 	meat = /obj/item/stack/sheet/plasteel{amount = 5}
 	skinned_type = /obj/item/stack/sheet/iron{amount = 10}
 	damage_overlay_type = "synth"