sacrifices to the CI gods

DopplerShift13 · Sep 5, 2024 · 9ba9b6e · 9ba9b6e
1 parent 2b18c3a
commit 9ba9b6e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm
@@ -40,6 +40,13 @@
 			receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_wrong)
 
 /obj/item/organ/external/tail/on_bodypart_insert(obj/item/bodypart/bodypart)
+	/// DOPPLER SHIFT ADDITION BEGIN
+	// damnit TG your own code fails CI for reasons unclear
+	if(bodypart == null)
+		return ..()
+	if(bodypart.owner == null)
+		return ..()
+	/// DOPPLER SHIFT ADDITION END
 	var/obj/item/organ/external/spines/our_spines = bodypart.owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_SPINES)
 	if(our_spines)
 		try_insert_tail_spines(bodypart)

diff --git a/modular_doppler/customization/code/accessory_overrides_lizard.dm b/modular_doppler/customization/code/accessory_overrides_lizard.dm
@@ -75,8 +75,9 @@
 		return TRUE
 	return FALSE
 
-/datum/preference/choiced/lizard_snout/create_default_value()
-	return pick(SSaccessories.snouts_list["None"])
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/lizard_snout/create_default_value()
+	return pick(SSaccessories.snouts_list["None"])*/
 
 
 
@@ -142,8 +143,9 @@
 		return TRUE
 	return FALSE
 
-/datum/preference/choiced/lizard_horns/create_default_value()
-	return pick(SSaccessories.horns_list["None"])
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/lizard_horns/create_default_value()
+	return pick(SSaccessories.horns_list["None"])*/
 
 
 
@@ -209,8 +211,9 @@
 		return TRUE
 	return FALSE
 
-/datum/preference/choiced/lizard_frills/create_default_value()
-	return pick(SSaccessories.frills_list["None"])
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/lizard_frills/create_default_value()
+	return pick(SSaccessories.frills_list["None"])*/
 
 
 
@@ -292,8 +295,9 @@
 		return TRUE
 	return FALSE
 
-/datum/preference/choiced/lizard_tail/create_default_value()
-	return /datum/sprite_accessory/tails/lizard/none::name
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/lizard_tail/create_default_value()
+	return /datum/sprite_accessory/tails/lizard/none::name*/
 
 /datum/preference/choiced/lizard_tail/icon_for(value)
 	var/datum/sprite_accessory/sprite_accessory = SSaccessories.tails_list_lizard[value]
@@ -363,8 +367,9 @@
 		return overlay
 	return ..()
 
-/datum/preference/choiced/lizard_body_markings/create_default_value()
-	return pick(SSaccessories.lizard_markings_list["None"])
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/lizard_body_markings/create_default_value()
+	return pick(SSaccessories.lizard_markings_list["None"])*/
 
 //toggle prefs
 /datum/preference/toggle/markings

diff --git a/modular_doppler/enterprise_resource_planning/code/breasts.dm b/modular_doppler/enterprise_resource_planning/code/breasts.dm
@@ -155,8 +155,9 @@
 	target.dna.features["breasts"] = value
 	//to_chat(world, "Applied!")
 
-/datum/preference/choiced/breasts/create_default_value()
-	return pick(SSaccessories.breasts_list["None"])
+//random isn't ideal but CI is forcing our hands here
+/*/datum/preference/choiced/breasts/create_default_value()
+	return pick(SSaccessories.breasts_list["None"])*/
 
 /datum/preference/choiced/breasts/is_accessible(datum/preferences/preferences)
 	. = ..()

diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx
@@ -115,7 +115,7 @@ export const FeatureTriColorInput = (props: FeatureValueProps<string[]>) => {
                     ? props.value[index]
                     : `#${props.value[index]}`,
                   border: '2px solid white',
-                  'box-sizing': 'content-box',
+                  boxSizing: 'content-box',
                   height: '11px',
                   width: '11px',
                   ...(props.shrink

diff --git a/...ui/interfaces/PreferencesMenu/preferences/features/dopplershift_preferences/erp_parts.tsx b/...ui/interfaces/PreferencesMenu/preferences/features/dopplershift_preferences/erp_parts.tsx
@@ -1,4 +1,4 @@
-import { FeatureTriColorInput, FeatureColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
+import { FeatureTriColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
 
 export const penis_color: Feature<string[]> = {
   name: 'Penis Color',

diff --git a/...erfaces/PreferencesMenu/preferences/features/dopplershift_preferences/mutant_newparts.tsx b/...erfaces/PreferencesMenu/preferences/features/dopplershift_preferences/mutant_newparts.tsx
@@ -1,4 +1,4 @@
-import { FeatureTriColorInput, FeatureColorInput, Feature } from '../base';
+import { FeatureTriColorInput, Feature } from '../base';
 
 export const fluff_color: Feature<string[]> = {
   name: 'Fluff Color',

diff --git a/...rfaces/PreferencesMenu/preferences/features/dopplershift_preferences/mutant_tricolors.tsx b/...rfaces/PreferencesMenu/preferences/features/dopplershift_preferences/mutant_tricolors.tsx
@@ -1,4 +1,4 @@
-import { FeatureTriColorInput, FeatureColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
+import { FeatureTriColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
 
 export const has_snout: FeatureToggle = {
   name: 'Add Part: Snout',