cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hole and Hole-Adjacent Changes (#15345)

Browse Source
This commit is contained in:
Geeves
2022-12-20 17:05:43 +01:00
committed by GitHub
parent 6719b17b3b
commit b4c4cf69ec
14 changed files with 127 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/animations.dm
+38 -44
View File
@@ -78,50 +78,39 @@ note dizziness decrements automatically in the mob's Life() proc.
//handles up-down floaty effect in space and zero-gravity
/mob/var/is_floating = 0
/mob/var/floatiness = 0
/mob/var/is_floating = FALSE
/mob/proc/update_floating(var/dense_object=0)
if(anchored||buckled_to)
make_floating(0)
/mob/proc/update_floating()
if(anchored || buckled_to)
set_floating(FALSE)
return
var/turf/turf = get_turf(src)
if(!istype(turf,/turf/space))
if(!turf?.is_hole)
var/area/A = turf.loc
if(istype(A) && A.has_gravity())
make_floating(0)
return
else if (Check_Shoegrip())
make_floating(0)
set_floating(FALSE)
return
else
make_floating(1)
return
var/shoegrip = Check_Shoegrip()
if(shoegrip)
set_floating(FALSE)
return
if(dense_object && Check_Shoegrip())
make_floating(0)
set_floating(TRUE)
/mob/proc/set_floating(var/floating_state)
if(buckled_to && is_floating)
stop_floating()
return
make_floating(1)
return
/mob/proc/make_floating(var/n)
if(buckled_to)
if(is_floating)
stop_floating()
return
floatiness = n
if(floatiness && !is_floating)
if(floating_state && !is_floating)
start_floating()
else if(!floatiness && is_floating)
else if(!floating_state && is_floating)
stop_floating()
/mob/proc/start_floating()
is_floating = 1
is_floating = TRUE
var/amplitude = 2 //maximum displacement from original position
var/period = 36 //time taken for the mob to go up >> down >> original position, in deciseconds. Should be multiple of 4
@@ -138,7 +127,7 @@ note dizziness decrements automatically in the mob's Life() proc.
/mob/proc/stop_floating()
animate(src, pixel_y = get_standard_pixel_y(), time = 5, easing = SINE_EASING | EASE_IN) //halt animation
//reset the pixel offsets to defaults
is_floating = 0
is_floating = FALSE
/atom/movable/proc/do_attack_animation(atom/A, atom/movable/weapon, var/image/attack_image, var/initial_pixel_x = 0, var/initial_pixel_y = 0)
var/pixel_x_diff = 0
@@ -198,7 +187,9 @@ note dizziness decrements automatically in the mob's Life() proc.
var/initial_pixel_x = get_standard_pixel_x()
var/initial_pixel_y = get_standard_pixel_y()
..(A, attack_item, attack_image, initial_pixel_x, initial_pixel_y)
is_floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
if(is_floating)
addtimer(CALLBACK(src, .proc/start_floating), 4)
if(attack_item == FIST_ATTACK_ANIMATION) // only play the physical movement
return
@@ -270,27 +261,30 @@ note dizziness decrements automatically in the mob's Life() proc.
return
// Mob Throwing Animation
/proc/animate_throw(atom/A)
var/ipx = A.pixel_x
var/ipy = A.pixel_y
/mob/proc/animate_throw()
var/ipx = pixel_x
var/ipy = pixel_y
var/mpx = 0
var/mpy = 0
if(A.dir & NORTH)
if(dir & NORTH)
mpy += 3
else if(A.dir & SOUTH)
else if(dir & SOUTH)
mpy -= 3
if(A.dir & EAST)
if(dir & EAST)
mpx += 3
else if(A.dir & WEST)
else if(dir & WEST)
mpx -= 3
var/x = mpx + ipx
var/y = mpy + ipy
var/new_x = mpx + ipx
var/new_y = mpy + ipy
animate(A, pixel_x = x, pixel_y = y, time = 0.6, easing = EASE_OUT)
animate(src, pixel_x = new_x, pixel_y = new_y, time = 0.6, easing = EASE_OUT)
var/matrix/M = matrix(A.transform)
animate(transform = turn(A.transform, (mpx - mpy) * 4), time = 0.6, easing = EASE_OUT)
var/matrix/M = matrix(transform)
animate(transform = turn(transform, (mpx - mpy) * 4), time = 0.6, easing = EASE_OUT)
animate(pixel_x = ipx, pixel_y = ipy, time = 0.6, easing = EASE_IN)
animate(transform = M, time = 0.6, easing = EASE_IN)
animate(transform = M, time = 0.6, easing = EASE_IN)
if(is_floating)
addtimer(CALLBACK(src, .proc/start_floating), 2.4)
code/modules/mob/inventory.dm
+5 -5
View File
@@ -24,7 +24,7 @@
/mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, del_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, ignore_blocked = FALSE, assisted_equip = FALSE)
if(!istype(W))
return FALSE
if(W.item_flags & NOMOVE) //Cannot move NOMOVE items from one inventory slot to another. Cannot do canremove here because then BSTs spawn naked.
if(W.item_flags & NOMOVE) //Cannot move NOMOVE items from one inventory slot to another. Cannot do canremove here because then BSTs spawn naked.
return FALSE
if(!W.mob_can_equip(src, slot, disable_warning, ignore_blocked))
@@ -398,12 +398,12 @@ var/list/slot_equipment_priority = list( \
for(var/obj/O in T)
if(!O.density) //We don't care about you.
continue
if(O.CanPass(item, T)) //Items have CANPASS for tables/railings, allows placement. Also checks windows.
if(O.CanPass(item, T)) //Items have CANPASS for tables/railings, allows placement. Also checks windows.
continue
if(istype(O, /obj/structure/closet/crate)) //Placing on/in crates is fine.
continue
return TRUE //Something is stopping us. Takes off throw mode.
if(unEquip(I))
make_item_drop_sound(I)
I.forceMove(T)
@@ -431,7 +431,7 @@ var/list/slot_equipment_priority = list( \
playsound(src, 'sound/effects/throw.ogg', volume, TRUE, -1)
// Animate the mob throwing.
animate_throw(src)
animate_throw()
item.throw_at(target, item.throw_range, item.throw_speed, src)
@@ -489,4 +489,4 @@ var/list/slot_equipment_priority = list( \
//When you drop an extremely heavy 406mm shell onto your foot. Oops!
/mob/living/carbon/proc/throw_fail_consequences(var/obj/item/I)
apply_damage(45, BRUTE, pick(list(BP_L_FOOT, BP_R_FOOT)), I, armor_pen = 30)
I.throw_fail_consequences(src)
I.throw_fail_consequences(src)
code/modules/mob/living/silicon/robot/robot_movement.dm
+3 -3
View File
@@ -6,7 +6,7 @@
/mob/living/silicon/robot/Allow_Spacemove()
if(module)
for(var/obj/item/tank/jetpack/J in module.modules)
if(J && J.allow_thrust(0.01))
if(J?.allow_thrust(0.01, src))
return TRUE
. = ..()
@@ -24,7 +24,7 @@
/mob/living/silicon/robot/Move()
. = ..()
if(client)
var/turf/B = GetAbove(get_turf(src))
if(up_hint)
@@ -41,4 +41,4 @@
var/mob/living/carbon/human/H = pulling
if(H.species.slowdown > speed)
. += H.species.slowdown - speed
. += H.ClothesSlowdown()
. += H.ClothesSlowdown()
code/modules/mob/mob_movement.dm
+5 -6
View File
@@ -504,16 +504,15 @@
var/turf/T = get_turf(src)
if (!T) // nullspace so sure, have gravity.
return 1
else if (istype(T, /turf/space))
return 0
return TRUE
else if(T.is_hole)
return FALSE
var/area/A = T.loc
if (!A.has_gravity() && !Check_Shoegrip())
return 0
return FALSE
return 1
return TRUE
/mob/proc/Check_Dense_Object() //checks for anything to push off in the vicinity. also handles magboots on gravity-less floors tiles