Skip to content

Commit

Permalink
Final CI sacrifices (Hopefully)
Browse files Browse the repository at this point in the history
  • Loading branch information
CliffracerX committed Sep 5, 2024
1 parent 5e80e4e commit 16187e9
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 18 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 10 additions & 15 deletions modular_doppler/customization/code/accessory_overrides_lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@
return TRUE
return FALSE

//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"])*/
/datum/preference/choiced/lizard_snout/create_default_value()
return "None"



Expand Down Expand Up @@ -143,9 +142,8 @@
return TRUE
return FALSE

//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"])*/
/datum/preference/choiced/lizard_horns/create_default_value()
return "None"



Expand Down Expand Up @@ -211,9 +209,8 @@
return TRUE
return FALSE

//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"])*/
/datum/preference/choiced/lizard_frills/create_default_value()
return "None"



Expand Down Expand Up @@ -295,9 +292,8 @@
return TRUE
return FALSE

//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/create_default_value()
return "None"

/datum/preference/choiced/lizard_tail/icon_for(value)
var/datum/sprite_accessory/sprite_accessory = SSaccessories.tails_list_lizard[value]
Expand Down Expand Up @@ -367,9 +363,8 @@
return overlay
return ..()

//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"])*/
/datum/preference/choiced/lizard_body_markings/create_default_value()
return "None"

//toggle prefs
/datum/preference/toggle/markings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
/datum/sprite_accessory/lizard_markings
icon = 'modular_doppler/customization/species/lizards/icons/lizard_markings.dmi'

/datum/sprite_accessory/lizard_markings/none
icon = 'modular_doppler/customization/icons/fallbacks.dmi'
name = "None"
icon_state = "none"

/datum/sprite_accessory/snouts
icon = 'modular_doppler/customization/species/lizards/icons/lizard_external.dmi'

Expand All @@ -13,9 +18,19 @@
/datum/sprite_accessory/frills
icon = 'modular_doppler/customization/species/lizards/icons/lizard_external.dmi'

/datum/sprite_accessory/frills/none
icon = 'modular_doppler/customization/icons/fallbacks.dmi'
name = "None"
icon_state = "none"

/datum/sprite_accessory/horns
icon = 'modular_doppler/customization/species/lizards/icons/lizard_external.dmi'

/datum/sprite_accessory/horns/none
icon = 'modular_doppler/customization/icons/fallbacks.dmi'
name = "None"
icon_state = "none"

/datum/sprite_accessory/tails/lizard
icon = 'modular_doppler/customization/species/lizards/icons/lizard_tails.dmi'

Expand Down
5 changes: 2 additions & 3 deletions modular_doppler/enterprise_resource_planning/code/breasts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,8 @@
target.dna.features["breasts"] = value
//to_chat(world, "Applied!")

//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/create_default_value()
return "Bare"

/datum/preference/choiced/breasts/is_accessible(datum/preferences/preferences)
. = ..()
Expand Down

0 comments on commit 16187e9

Please sign in to comment.