diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index ba6153aa77f..dcfcd0d84d5 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -691,12 +691,6 @@ TEXT_WEST = list(0, 0, MOB_BELOW_PIGGYBACK_LAYER), ) -/datum/component/riding/creature/raptor/update_parent_layer_and_offsets(dir, animate) - . = ..() - var/mob/living/basic/raptor/raptor = parent - if (istype(raptor)) - raptor.adjust_offsets(dir) - /datum/component/riding/creature/raptor/combat ai_behavior_while_ridden = RIDING_PAUSE_AI_MOVEMENT diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm index 2915cae1370..fdcb0707cd8 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm @@ -13,8 +13,8 @@ GLOBAL_LIST_EMPTY(raptor_population) icon = 'icons/mob/simple/lavaland/raptor_big.dmi' icon_state = "raptor_red" base_icon_state = "raptor" - pixel_w = -12 - base_pixel_w = -12 + pixel_w = -20 + base_pixel_w = -20 speed = 0.5 mob_biotypes = MOB_ORGANIC|MOB_BEAST maxHealth = 200 @@ -42,8 +42,6 @@ GLOBAL_LIST_EMPTY(raptor_population) ai_controller = null /// Can this raptor breed? var/can_breed = TRUE - /// Should we change offsets on direction change? - var/change_offsets = TRUE /// Pet commands when we tame the raptor var/static/list/pet_commands = list( /datum/pet_command/breed, @@ -105,7 +103,7 @@ GLOBAL_LIST_EMPTY(raptor_population) if (!mapload) GLOB.raptor_population += REF(src) - AddComponent(/datum/component/obeys_commands, pet_commands, list(0, -base_pixel_w)) + AddComponent(/datum/component/obeys_commands, pet_commands, list(-base_pixel_w, 0)) AddElement(\ /datum/element/change_force_on_death,\ move_resist = MOVE_RESIST_DEFAULT,\ @@ -124,9 +122,7 @@ GLOBAL_LIST_EMPTY(raptor_population) update_blackboard() AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_CLAW) - RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) RegisterSignal(src, COMSIG_LIVING_SCOOPED_UP, PROC_REF(on_picked_up)) - adjust_offsets(dir) add_happiness_component() /mob/living/basic/raptor/Destroy() @@ -143,22 +139,6 @@ GLOBAL_LIST_EMPTY(raptor_population) return return ..() -/mob/living/basic/raptor/proc/on_dir_change(datum/source, old_dir, new_dir) - SIGNAL_HANDLER - adjust_offsets(new_dir) - -/mob/living/basic/raptor/proc/adjust_offsets(direction) - if (!change_offsets) - return - - switch (direction) - if (NORTH, SOUTH) - add_offsets(RAPTOR_INNATE_SOURCE, w_add = 0, animate = FALSE) - if (EAST, SOUTHEAST, NORTHEAST) - add_offsets(RAPTOR_INNATE_SOURCE, w_add = -8, animate = FALSE) - if (WEST, SOUTHWEST, NORTHWEST) - add_offsets(RAPTOR_INNATE_SOURCE, w_add = 8, animate = FALSE) - /mob/living/basic/raptor/examine(mob/user) . = ..() if (stat == DEAD) @@ -385,7 +365,6 @@ GLOBAL_LIST_EMPTY(raptor_population) density = initial(density) move_resist = initial(move_resist) can_breed = initial(can_breed) - change_offsets = initial(change_offsets) if (new_stage == RAPTOR_ADULT) // Adults need to be tamed with skill rather than snacks @@ -395,16 +374,10 @@ GLOBAL_LIST_EMPTY(raptor_population) density = FALSE can_breed = FALSE move_resist = MOVE_RESIST_DEFAULT - change_offsets = FALSE if (prev_stage == RAPTOR_ADULT) AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15, unique = TRUE) - if (change_offsets) - adjust_offsets(dir) - else - remove_offsets(RAPTOR_INNATE_SOURCE, FALSE) - if (can_breed) add_breeding_component() else diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm index bc6782895c2..b366a44b7b6 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm @@ -124,12 +124,9 @@ GLOBAL_LIST_INIT(raptor_colors, init_raptor_colors()) // Purple raptors never "fully" grow up, and remain usable as backpacks /datum/raptor_color/purple/setup_adult(mob/living/basic/raptor/raptor) - raptor.base_pixel_w = initial(raptor.base_pixel_w) raptor.can_be_held = TRUE raptor.density = FALSE raptor.move_resist = MOVE_RESIST_DEFAULT - raptor.change_offsets = FALSE - raptor.remove_offsets(RAPTOR_INNATE_SOURCE, FALSE) raptor.held_w_class = WEIGHT_CLASS_BULKY . = ..() // Non-shorties cannot ride these, so we gotta keep em tameable through food diff --git a/icons/mob/simple/lavaland/raptor_big.dmi b/icons/mob/simple/lavaland/raptor_big.dmi index 4e4932f91a4..84a8a035c0d 100644 Binary files a/icons/mob/simple/lavaland/raptor_big.dmi and b/icons/mob/simple/lavaland/raptor_big.dmi differ