mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +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)")
|
||||
|
||||
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)
|
||||
|
||||
feedback_add_details("changeling_powers","ED")
|
||||
|
||||
@@ -323,6 +323,9 @@ default behaviour is:
|
||||
else if(!isspace(loc))
|
||||
inertia_dir = 0
|
||||
make_floating(0)
|
||||
if(status_flags & HIDING)
|
||||
layer = HIDING_LAYER
|
||||
plane = OBJ_PLANE
|
||||
|
||||
/mob/living/proc/inertial_drift()
|
||||
if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy))
|
||||
@@ -330,8 +333,11 @@ default behaviour is:
|
||||
inertia_dir = 0
|
||||
return
|
||||
|
||||
var/locthen = loc
|
||||
spawn(5)
|
||||
addtimer(CALLBACK(src, PROC_REF(handle_inertial_drift), loc), 0.5 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
/mob/living/proc/handle_inertial_drift(var/locthen)
|
||||
PRIVATE_PROC(TRUE)
|
||||
SHOULD_NOT_OVERRIDE(TRUE)
|
||||
if(!anchored && !pulledby && loc == locthen)
|
||||
var/stepdir = inertia_dir ? inertia_dir : last_move
|
||||
if(!stepdir)
|
||||
|
||||
@@ -54,11 +54,3 @@
|
||||
else
|
||||
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."))
|
||||
|
||||
//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)
|
||||
custom_emote_vr(1, "rubs their [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
|
||||
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()
|
||||
return TRUE
|
||||
to_chat(src, span_vwarning("There is no suitable belly for rubs."))
|
||||
|
||||
@@ -32,6 +32,8 @@ export const GyrotronControlContent = (props) => {
|
||||
|
||||
return (
|
||||
<Section
|
||||
fill
|
||||
scrollable
|
||||
title="Gyrotrons"
|
||||
buttons={
|
||||
<Button icon="pencil-alt" onClick={() => act('set_tag')}>
|
||||
|
||||
Reference in New Issue
Block a user