Skip to content

Commit

Permalink
get outta here ! ! !
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerev4r committed Oct 13, 2024
1 parent 9534cfe commit 127859b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/datums/components/caltrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
return

if (!(flags & CALTROP_BYPASS_SHOES))
// NOVA EDIT ADDITION BEGIN - Hardened Soles Quirk
// DOPPLER EDIT ADDITION BEGIN - Hardened Soles Quirk
if(HAS_TRAIT(digitigrade_fan, TRAIT_HARD_SOLES))
return
// NOVA EDIT ADDITION END
// DOPPLER EDIT ADDITION END
if ((digitigrade_fan.wear_suit?.body_parts_covered | digitigrade_fan.w_uniform?.body_parts_covered | digitigrade_fan.shoes?.body_parts_covered) & FEET)
return

Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences/middleware/_middleware.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
return FALSE

/// Called when applying preferences to the mob.
/datum/preference_middleware/proc/apply_to_human(mob/living/carbon/human/target, datum/preferences/preferences, visuals_only = FALSE) //NOVA EDIT CHANGE
/datum/preference_middleware/proc/apply_to_human(mob/living/carbon/human/target, datum/preferences/preferences, visuals_only = FALSE) //DOPPLER EDIT CHANGE
SHOULD_NOT_SLEEP(TRUE)
SHOULD_CALL_PARENT(FALSE)
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/loadout/loadout_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
if(can_be_named && item_details?[INFO_NAMED] && !visuals_only)
equipped_item.name = trim(item_details[INFO_NAMED], PREVENT_CHARACTER_TRIM_LOSS(MAX_NAME_LEN))
ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout")
equipped_item.on_loadout_custom_named() // NOVA EDIT ADDITION - Loadout item names
equipped_item.on_loadout_custom_named() // DOPPLER EDIT ADDITION - Loadout item names

// DOPPLER EDIT ADDITION START - Loadout item descriptions
if(can_be_named && item_details?[INFO_DESCRIBED] && !visuals_only)
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import { ServerPreferencesFetcher } from './ServerPreferencesFetcher';
import { useRandomToggleState } from './useRandomToggleState';

const CLOTHING_CELL_SIZE = 48;
const CLOTHING_SIDEBAR_ROWS = 13.4; // NOVA EDIT CHANGE - ORIGINAL: 9
const CLOTHING_SIDEBAR_ROWS = 13.4; // DOPPLER EDIT CHANGE - ORIGINAL: 9

const CLOTHING_SELECTION_CELL_SIZE = 48;
const CLOTHING_SELECTION_WIDTH = 5.4;
Expand Down

0 comments on commit 127859b

Please sign in to comment.