Skip to content

Commit

Permalink
CI Snackrifices Continued
Browse files Browse the repository at this point in the history
WHY IS *TGUI SPECIFIC PRETTIER* MANDATORY TO PASS CI AUGHGHGH
THEIR CODE STYLE IS GIANT BLOBS
  • Loading branch information
CliffracerX committed Sep 5, 2024
1 parent 9ba9b6e commit 5e80e4e
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 30 deletions.
3 changes: 2 additions & 1 deletion code/__DEFINES/~doppler/species.dm
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#define SPECIES_SLUGCAT "slugcat"
// Slugcats, from Talon III.
#define SPECIES_SLUGCAT "slugcat"
2 changes: 1 addition & 1 deletion code/modules/surgery/organs/external/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/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
// damnit TG your own code fails CI for reasons unclear - TODO, stack trace this to eventually figure out how it's ending up with null owners
if(bodypart == null)
return ..()
if(bodypart.owner == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ export const FeatureTriColorInput = (props: FeatureValueProps<string[]>) => {
preference: props.featureId,
value: index + 1,
});
}}>
}}
>
<Stack align="center" fill>
<Stack.Item>
<Box
Expand All @@ -120,8 +121,8 @@ export const FeatureTriColorInput = (props: FeatureValueProps<string[]>) => {
width: '11px',
...(props.shrink
? {
'margin': '1px',
}
margin: '1px',
}
: {}),
}}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { FeatureTriColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
import {
CheckboxInput,
Feature,
FeatureToggle,
FeatureTriColorInput,
} from '../base';

export const penis_color: Feature<string[]> = {
name: 'Penis Color',
Expand All @@ -24,8 +29,7 @@ export const has_breasts: FeatureToggle = {
component: CheckboxInput,
};


export const breasts_color: Feature<string[]> = {
name: 'Breasts Color',
component: FeatureTriColorInput,
};
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FeatureTriColorInput, Feature } from '../base';
import { Feature, FeatureTriColorInput } from '../base';

export const fluff_color: Feature<string[]> = {
name: 'Fluff Color',
Expand All @@ -23,4 +23,4 @@ export const xenodorsal_color: Feature<string[]> = {
export const xenohead_color: Feature<string[]> = {
name: 'Xenohead Color',
component: FeatureTriColorInput,
};
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { FeatureTriColorInput, Feature, CheckboxInput, FeatureToggle } from '../base';
import {
CheckboxInput,
Feature,
FeatureToggle,
FeatureTriColorInput,
} from '../base';

export const has_snout: FeatureToggle = {
name: 'Add Part: Snout',
Expand All @@ -14,8 +19,6 @@ export const snout_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_horns: FeatureToggle = {
name: 'Add Part: Horns',
category: 'GAMEPLAY',
Expand All @@ -30,8 +33,6 @@ export const horns_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_frills: FeatureToggle = {
name: 'Add Part: Frills',
category: 'GAMEPLAY',
Expand All @@ -46,8 +47,6 @@ export const frills_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_tail: FeatureToggle = {
name: 'Add Part: Tail',
category: 'GAMEPLAY',
Expand All @@ -62,8 +61,6 @@ export const tail_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_ears: FeatureToggle = {
name: 'Add Part: Snout',
category: 'GAMEPLAY',
Expand All @@ -78,8 +75,6 @@ export const ears_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_spines: FeatureToggle = {
name: 'Add Part: Spines',
category: 'GAMEPLAY',
Expand All @@ -94,8 +89,6 @@ export const spines_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_caps: FeatureToggle = {
name: 'Add Part: Snout',
category: 'GAMEPLAY',
Expand All @@ -110,8 +103,6 @@ export const caps_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_markings: FeatureToggle = {
name: 'Add Part: Basic Markings',
category: 'GAMEPLAY',
Expand Down Expand Up @@ -140,8 +131,6 @@ export const moth_markings_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_wings: FeatureToggle = {
name: 'Add Part: Wings',
category: 'GAMEPLAY',
Expand Down Expand Up @@ -170,8 +159,6 @@ export const moth_wings_color: Feature<string[]> = {
component: FeatureTriColorInput,
};



export const has_antennae: FeatureToggle = {
name: 'Add Part: Antennae',
category: 'GAMEPLAY',
Expand All @@ -198,4 +185,4 @@ export const has_moth_antennae: FeatureToggle = {
export const moth_antennae_color: Feature<string[]> = {
name: 'Moth Antennae Color',
component: FeatureTriColorInput,
};
};

0 comments on commit 5e80e4e

Please sign in to comment.