diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm index 8a067d08a8..9a31049b57 100644 --- a/code/game/area/areas_vr.dm +++ b/code/game/area/areas_vr.dm @@ -26,7 +26,7 @@ if(!ceiling_type) return for(var/turf/T in contents) - if(T.outdoors >= 0) + if(T.is_outdoors() >= 0) continue if(HasAbove(T.z)) var/turf/TA = GetAbove(T) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index e3c94d8ec5..6cdaf331ad 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -136,7 +136,8 @@ bloodDNA = null - if(src.wet || (dirtslip && (dirt > 50 || outdoors == 1))) + var/turf_is_outdoors = is_outdoors() + if(src.wet || (dirtslip && (dirt > 50 || turf_is_outdoors == OUTDOORS_YES))) if(M.buckled || (src.wet == 1 && M.m_intent == I_WALK)) return @@ -147,7 +148,7 @@ slip_stun = 10 if(dirt > 50) floor_type = "dirty" - else if(outdoors) + else if(turf_is_outdoors) floor_type = "uneven" if(src.wet == 0 && M.m_intent == I_WALK) return diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index a7fc846840..8072ad99e8 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -668,15 +668,15 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors) /turf/simulated/mineral/cave/virgo3c VIRGO3C_SET_ATMOS - outdoors = 0 + outdoors = OUTDOORS_NO /turf/simulated/mineral/floor/virgo3c VIRGO3C_SET_ATMOS - outdoors = 0 + outdoors = OUTDOORS_NO /turf/simulated/mineral/floor/ignore_mapgen/virgo3c VIRGO3C_SET_ATMOS - outdoors = 0 + outdoors = OUTDOORS_NO /turf/simulated/floor/outdoors/grass/virgo3c VIRGO3C_SET_ATMOS diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm b/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm index 739850ea96..5222ddba21 100644 --- a/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm +++ b/code/modules/vore/eating/panel_databackend/vorepanel_set_attribute.dm @@ -401,11 +401,10 @@ host.vore_selected.eating_privacy_local = privacy_choice . = TRUE if("b_silicon_belly") - var/belly_choice = params["Val"] + var/belly_choice = params["val"] if(!(belly_choice in list("Sleeper", "Vorebelly", "Both"))) return FALSE - for (var/belly in host.vore_organs) - var/obj/belly/B = belly + for(var/obj/belly/B in host.vore_organs) B.silicon_belly_overlay_preference = belly_choice host.update_icon() . = TRUE diff --git a/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm b/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm index 364432cb87..c0a931517d 100644 --- a/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm +++ b/code/modules/vore/eating/panel_databackend/vorepanel_vore_data.dm @@ -156,11 +156,6 @@ selected_list["belly_description_data"] = belly_description_data if(active_vore_tab == OPTIONS_TAB) - var/list/silicon_control = list( - "silicon_belly_overlay_preference" = selected.silicon_belly_overlay_preference, - "belly_sprite_option_shown" = LAZYLEN(owner.vore_icon_bellies) >= 1 ? TRUE : FALSE, - "belly_sprite_to_affect" = selected.belly_sprite_to_affect - ) var/list/belly_option_data = list( "can_taste" = selected.can_taste, "is_feedable" = selected.is_feedable, @@ -191,7 +186,6 @@ "private_struggle" = selected.private_struggle, "drainmode" = selected.drainmode, "drainmode_options" = selected.drainmodes, - "mob_belly_controls" = silicon_control ) if(selected.contaminates) belly_option_data += list( @@ -220,6 +214,11 @@ selected_list["belly_sound_data"] = belly_sound_data if(active_vore_tab == VISUALS_TAB) + var/list/silicon_control = list( + "silicon_belly_overlay_preference" = selected.silicon_belly_overlay_preference, + "belly_sprite_option_shown" = LAZYLEN(owner.vore_icon_bellies) >= 1 ? TRUE : FALSE, + "belly_sprite_to_affect" = selected.belly_sprite_to_affect + ) var/list/belly_fullscreens if(selected.colorization_enabled) belly_fullscreens = icon_states('icons/mob/screen_full_vore_list.dmi') //Makes any icons inside of here selectable. @@ -265,7 +264,8 @@ "undergarment_color" = selected.undergarment_color, "tail_option_shown" = ishuman(owner), "tail_to_change_to" = selected.tail_to_change_to, - "tail_sprite_options" = global.tail_styles_list + "tail_sprite_options" = global.tail_styles_list, + "mob_belly_controls" = silicon_control ) selected_list["belly_visual_data"] = belly_visual_data diff --git a/tgui/packages/tgui/interfaces/VorePanel/VorePanelMainTabs/VoreSelectedBelly.tsx b/tgui/packages/tgui/interfaces/VorePanel/VorePanelMainTabs/VoreSelectedBelly.tsx index efef954cd8..b6d0d004d9 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/VorePanelMainTabs/VoreSelectedBelly.tsx +++ b/tgui/packages/tgui/interfaces/VorePanel/VorePanelMainTabs/VoreSelectedBelly.tsx @@ -73,7 +73,6 @@ export const VoreSelectedBelly = (props: { ); tabs[3] = belly_sound_data && ( @@ -86,6 +85,7 @@ export const VoreSelectedBelly = (props: { ); tabs[5] = belly_interaction_data && ( diff --git a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/OptionTab/BellyOptionsLeft.tsx b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/OptionTab/BellyOptionsLeft.tsx index 3925e8defd..95f5791a45 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/OptionTab/BellyOptionsLeft.tsx +++ b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/OptionTab/BellyOptionsLeft.tsx @@ -2,20 +2,18 @@ import { LabeledList, Stack } from 'tgui-core/components'; import { eatingMessagePrivacy } from '../../constants'; import { sanitize_color } from '../../functions'; -import type { bellyOptionData, hostMob } from '../../types'; +import type { bellyOptionData } from '../../types'; import { VorePanelColorBox } from '../../VorePanelElements/VorePanelCommonElements'; import { VorePanelEditDropdown } from '../../VorePanelElements/VorePanelEditDropdown'; import { VorePanelEditNumber } from '../../VorePanelElements/VorePanelEditNumber'; import { VorePanelEditSwitch } from '../../VorePanelElements/VorePanelEditSwitch'; import { VoreSelectedWhitelist } from '../VisualTab/VoreSelecetedWhitelist'; -import { VoreSelectedMobTypeBellyButtons } from '../VisualTab/VoreSelectedMobTypeBellyButtons'; export const BellyOptionsLeft = (props: { editMode: boolean; bellyOptionData: bellyOptionData; - host_mobtype: hostMob; }) => { - const { editMode, bellyOptionData, host_mobtype } = props; + const { editMode, bellyOptionData } = props; const { can_taste, is_feedable, @@ -29,7 +27,6 @@ export const BellyOptionsLeft = (props: { save_digest_mode, eating_privacy_local, private_struggle, - mob_belly_controls, vorespawn_blacklist, vorespawn_whitelist, vorespawn_absorbed, @@ -179,11 +176,6 @@ export const BellyOptionsLeft = (props: { /> - +
+
Your module does either not support vore sprites or you've selected a belly sprite other than the sleeper within the Visuals diff --git a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VisualTab/VoreSpriteAffect.tsx b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VisualTab/VoreSpriteAffect.tsx index 836d4caeec..8311479c44 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VisualTab/VoreSpriteAffect.tsx +++ b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VisualTab/VoreSpriteAffect.tsx @@ -1,18 +1,20 @@ import { Box, LabeledList, Stack } from 'tgui-core/components'; import { spriteToTooltip } from '../../constants'; -import type { bellyVisualData } from '../../types'; +import type { bellyVisualData, hostMob } from '../../types'; import { VorePanelEditCheckboxes } from '../../VorePanelElements/VorePanelEditCheckboxes'; import { VorePanelEditColor } from '../../VorePanelElements/VorePanelEditColor'; import { VorePanelEditDropdown } from '../../VorePanelElements/VorePanelEditDropdown'; import { VorePanelEditNumber } from '../../VorePanelElements/VorePanelEditNumber'; import { VorePanelEditSwitch } from '../../VorePanelElements/VorePanelEditSwitch'; +import { VoreSelectedMobTypeBellyButtons } from './VoreSelectedMobTypeBellyButtons'; export const VoreSpriteAffects = (props: { editMode: boolean; bellyVisualData: bellyVisualData; + hostMobtype: hostMob; }) => { - const { editMode, bellyVisualData } = props; + const { editMode, bellyVisualData, hostMobtype } = props; const { vore_sprite_flags, absorbed_voresprite, @@ -34,6 +36,7 @@ export const VoreSpriteAffects = (props: { tail_option_shown, tail_to_change_to, tail_sprite_options, + mob_belly_controls, } = bellyVisualData; return ( @@ -170,6 +173,11 @@ export const VoreSpriteAffects = (props: { )} + diff --git a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyOptions.tsx b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyOptions.tsx index e50cf0f804..89122dc7d7 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyOptions.tsx +++ b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyOptions.tsx @@ -1,15 +1,14 @@ import { Stack } from 'tgui-core/components'; -import type { bellyOptionData, hostMob } from '../types'; +import type { bellyOptionData } from '../types'; import { BellyOptionsLeft } from './OptionTab/BellyOptionsLeft'; import { BellyOptionsRight } from './OptionTab/BellyOptionsRight'; export const VoreSelectedBellyOptions = (props: { editMode: boolean; bellyOptionData: bellyOptionData; - host_mobtype: hostMob; }) => { - const { editMode, bellyOptionData, host_mobtype } = props; + const { editMode, bellyOptionData } = props; return ( @@ -17,7 +16,6 @@ export const VoreSelectedBellyOptions = (props: { diff --git a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyVisuals.tsx b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyVisuals.tsx index a37acb4763..8570f9de5c 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyVisuals.tsx +++ b/tgui/packages/tgui/interfaces/VorePanel/VoreSelectedBellyTabs/VoreSelectedBellyVisuals.tsx @@ -1,7 +1,7 @@ import { useBackend } from 'tgui/backend'; import { Button, LabeledList, Section, Stack } from 'tgui-core/components'; -import type { bellyVisualData } from '../types'; +import type { bellyVisualData, hostMob } from '../types'; import { VorePanelEditColor } from '../VorePanelElements/VorePanelEditColor'; import { VorePanelEditSwitch } from '../VorePanelElements/VorePanelEditSwitch'; import { BellyFullscreenSelection } from './VisualTab/BellyFullscreenSelection'; @@ -10,10 +10,11 @@ import { VoreSpriteAffects } from './VisualTab/VoreSpriteAffect'; export const VoreSelectedBellyVisuals = (props: { editMode: boolean; bellyVisualData: bellyVisualData; + hostMobtype: hostMob; }) => { const { act } = useBackend(); - const { editMode, bellyVisualData } = props; + const { editMode, bellyVisualData, hostMobtype } = props; const { belly_fullscreen, colorization_enabled, @@ -46,6 +47,7 @@ export const VoreSelectedBellyVisuals = (props: { )}
diff --git a/tgui/packages/tgui/interfaces/VorePanel/types.ts b/tgui/packages/tgui/interfaces/VorePanel/types.ts index 5544770d57..b979ff6bc1 100644 --- a/tgui/packages/tgui/interfaces/VorePanel/types.ts +++ b/tgui/packages/tgui/interfaces/VorePanel/types.ts @@ -132,7 +132,6 @@ export type bellyOptionData = { private_struggle: BooleanLike; drainmode_options: string[]; drainmode: string; - mob_belly_controls: siliconeBellyControls; }; export type bellySoundData = { @@ -180,6 +179,7 @@ export type bellyVisualData = { tail_option_shown: BooleanLike; tail_to_change_to: BooleanLike | string; tail_sprite_options: string[]; + mob_belly_controls: siliconeBellyControls; }; export type bellyInteractionData = { diff --git a/tools/ci/build.ps1 b/tools/ci/build.ps1 index 4694cc3be5..5e749902ec 100755 --- a/tools/ci/build.ps1 +++ b/tools/ci/build.ps1 @@ -5,6 +5,6 @@ if(!(Test-Path -Path "C:/byond")){ } bash tools/ci/install_node.sh -bash tools/build/build -Werror +bash tools/build/build.sh -Werror exit $LASTEXITCODE