mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
[MIRROR] movement fixes (#10481)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
fb81045e89
commit
1a758fcb0f
@@ -38,7 +38,7 @@
|
|||||||
add_attack_logs(src,T,"DNA extraction sting (changeling)")
|
add_attack_logs(src,T,"DNA extraction sting (changeling)")
|
||||||
|
|
||||||
var/saved_dna = T.dna.Clone() /// Prevent transforming bugginess.
|
var/saved_dna = T.dna.Clone() /// Prevent transforming bugginess.
|
||||||
var/datum/absorbed_dna/newDNA = new(T.real_name, saved_dna, T.species.name, T.languages, T.identifying_gender, T.flavor_text, T.modifiers)
|
var/datum/absorbed_dna/newDNA = new(T.real_name, saved_dna, T.species.name, T.languages, T.identifying_gender, T.flavor_texts, T.modifiers)
|
||||||
absorbDNA(newDNA)
|
absorbDNA(newDNA)
|
||||||
|
|
||||||
feedback_add_details("changeling_powers","ED")
|
feedback_add_details("changeling_powers","ED")
|
||||||
|
|||||||
@@ -26,9 +26,9 @@
|
|||||||
/*one proc, four uses
|
/*one proc, four uses
|
||||||
swapping: if it's 1, the mobs are trying to switch, if 0, non-passive is pushing passive
|
swapping: if it's 1, the mobs are trying to switch, if 0, non-passive is pushing passive
|
||||||
default behaviour is:
|
default behaviour is:
|
||||||
- non-passive mob passes the passive version
|
- non-passive mob passes the passive version
|
||||||
- passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags
|
- passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags
|
||||||
- if si, the proc returns
|
- if si, the proc returns
|
||||||
*/
|
*/
|
||||||
/mob/living/proc/can_move_mob(var/mob/living/swapped, swapping = 0, passive = 0)
|
/mob/living/proc/can_move_mob(var/mob/living/swapped, swapping = 0, passive = 0)
|
||||||
if(!swapped)
|
if(!swapped)
|
||||||
@@ -323,6 +323,9 @@ default behaviour is:
|
|||||||
else if(!isspace(loc))
|
else if(!isspace(loc))
|
||||||
inertia_dir = 0
|
inertia_dir = 0
|
||||||
make_floating(0)
|
make_floating(0)
|
||||||
|
if(status_flags & HIDING)
|
||||||
|
layer = HIDING_LAYER
|
||||||
|
plane = OBJ_PLANE
|
||||||
|
|
||||||
/mob/living/proc/inertial_drift()
|
/mob/living/proc/inertial_drift()
|
||||||
if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy))
|
if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy))
|
||||||
@@ -330,16 +333,19 @@ default behaviour is:
|
|||||||
inertia_dir = 0
|
inertia_dir = 0
|
||||||
return
|
return
|
||||||
|
|
||||||
var/locthen = loc
|
addtimer(CALLBACK(src, PROC_REF(handle_inertial_drift), loc), 0.5 SECONDS, TIMER_DELETE_ME)
|
||||||
spawn(5)
|
|
||||||
if(!anchored && !pulledby && loc == locthen)
|
/mob/living/proc/handle_inertial_drift(var/locthen)
|
||||||
var/stepdir = inertia_dir ? inertia_dir : last_move
|
PRIVATE_PROC(TRUE)
|
||||||
if(!stepdir)
|
SHOULD_NOT_OVERRIDE(TRUE)
|
||||||
return
|
if(!anchored && !pulledby && loc == locthen)
|
||||||
var/turf/T = get_step(src, stepdir)
|
var/stepdir = inertia_dir ? inertia_dir : last_move
|
||||||
if(!T)
|
if(!stepdir)
|
||||||
return
|
return
|
||||||
Move(T, stepdir, 5)
|
var/turf/T = get_step(src, stepdir)
|
||||||
|
if(!T)
|
||||||
|
return
|
||||||
|
Move(T, stepdir, 5)
|
||||||
|
|
||||||
/mob/living/proc/handle_footstep(turf/T)
|
/mob/living/proc/handle_footstep(turf/T)
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|||||||
@@ -54,11 +54,3 @@
|
|||||||
else
|
else
|
||||||
touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE
|
touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE
|
||||||
to_chat(src,span_notice("You will now dodge all attempts at hugging, patting, booping, licking, smelling and hand shaking."))
|
to_chat(src,span_notice("You will now dodge all attempts at hugging, patting, booping, licking, smelling and hand shaking."))
|
||||||
|
|
||||||
//ChompEDIT START - re-assert our layer and plane
|
|
||||||
/mob/living/Moved(var/atom/oldloc, direct, forced, movetime)
|
|
||||||
. = ..()
|
|
||||||
if(status_flags & HIDING)
|
|
||||||
layer = HIDING_LAYER
|
|
||||||
plane = OBJ_PLANE
|
|
||||||
//ChompEDIT END
|
|
||||||
|
|||||||
@@ -1717,7 +1717,7 @@
|
|||||||
if(T == src)
|
if(T == src)
|
||||||
custom_emote_vr(1, "rubs their [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
|
custom_emote_vr(1, "rubs their [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
|
||||||
else
|
else
|
||||||
custom_emote_vr(1, "gives some rubs over [T]'s [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
|
custom_emote_vr(1, "gives some rubs over [T]'s [T.belly_rub_target ? T.belly_rub_target : lowertext(B.name)].")
|
||||||
B.quick_cycle()
|
B.quick_cycle()
|
||||||
return TRUE
|
return TRUE
|
||||||
to_chat(src, span_vwarning("There is no suitable belly for rubs."))
|
to_chat(src, span_vwarning("There is no suitable belly for rubs."))
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ export const GyrotronControlContent = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Section
|
<Section
|
||||||
|
fill
|
||||||
|
scrollable
|
||||||
title="Gyrotrons"
|
title="Gyrotrons"
|
||||||
buttons={
|
buttons={
|
||||||
<Button icon="pencil-alt" onClick={() => act('set_tag')}>
|
<Button icon="pencil-alt" onClick={() => act('set_tag')}>
|
||||||
|
|||||||
Reference in New Issue
Block a user