Merge pull request #15631 from timothyteakettle/genitals-get-optimised
optimises genital/tail organs by returning when calling on_life
This commit is contained in:
@@ -33,6 +33,9 @@
|
|||||||
linked_organ = null
|
linked_organ = null
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|
||||||
|
/obj/item/organ/genital/on_life()
|
||||||
|
return
|
||||||
|
|
||||||
/obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle")
|
/obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle")
|
||||||
if(!(genital_flags & GENITAL_CAN_AROUSE))
|
if(!(genital_flags & GENITAL_CAN_AROUSE))
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|||||||
@@ -15,12 +15,6 @@
|
|||||||
var/prev_size //former size value, to allow update_size() to early return should be there no significant changes.
|
var/prev_size //former size value, to allow update_size() to early return should be there no significant changes.
|
||||||
layer_index = BUTT_LAYER_INDEX
|
layer_index = BUTT_LAYER_INDEX
|
||||||
|
|
||||||
/obj/item/organ/genital/butt/on_life()
|
|
||||||
if(QDELETED(src))
|
|
||||||
return
|
|
||||||
if(!owner)
|
|
||||||
return
|
|
||||||
|
|
||||||
/obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX)
|
/obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX)
|
||||||
var/new_value = clamp(size_cached + modifier, min, max)
|
var/new_value = clamp(size_cached + modifier, min, max)
|
||||||
if(new_value == size_cached)
|
if(new_value == size_cached)
|
||||||
|
|||||||
@@ -13,6 +13,9 @@
|
|||||||
owner.dna.species.stop_wagging_tail(owner)
|
owner.dna.species.stop_wagging_tail(owner)
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
/obj/item/organ/tail/on_life()
|
||||||
|
return
|
||||||
|
|
||||||
/obj/item/organ/tail/cat
|
/obj/item/organ/tail/cat
|
||||||
name = "cat tail"
|
name = "cat tail"
|
||||||
desc = "A severed cat tail. Who's wagging now?"
|
desc = "A severed cat tail. Who's wagging now?"
|
||||||
|
|||||||
Reference in New Issue
Block a user