diff --git a/code/datums/elements/ghost_role_eligibility.dm b/code/datums/elements/ghost_role_eligibility.dm index 519a34e01f..81fd593d5f 100644 --- a/code/datums/elements/ghost_role_eligibility.dm +++ b/code/datums/elements/ghost_role_eligibility.dm @@ -15,6 +15,7 @@ var/mob/M = target if(!(M in eligible_mobs)) eligible_mobs += M + RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/get_ghost_flags) if(penalize) //penalizing them from making a ghost role / midround antag comeback right away. var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES @@ -32,12 +33,12 @@ else if(timeouts[M.ckey] == CANT_REENTER_ROUND) return timeouts[M.ckey] = max(timeouts[M.ckey],penalty) - RegisterSignal(M,COMSIG_MOB_GHOSTIZE,.proc/get_ghost_flags) /datum/element/ghost_role_eligibility/Detach(mob/M) . = ..() if(M in eligible_mobs) eligible_mobs -= M + UnregisterSignal(M, COMSIG_MOB_GHOSTIZE) /datum/element/ghost_role_eligibility/proc/get_all_ghost_role_eligible(silent = FALSE) var/list/candidates = list() diff --git a/code/modules/antagonists/abductor/abductee/abductee.dm b/code/modules/antagonists/abductor/abductee/abductee.dm index 901d2f5b11..780c3f7419 100644 --- a/code/modules/antagonists/abductor/abductee/abductee.dm +++ b/code/modules/antagonists/abductor/abductee/abductee.dm @@ -31,4 +31,5 @@ /datum/antagonist/abductee/remove_innate_effects(mob/living/mob_override) update_abductor_icons_removed(mob_override ? mob_override.mind : owner) - qdel(brain_trauma) + if(!QDELETED(brain_trauma)) + qdel(brain_trauma) diff --git a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm index dcefa27305..6bbe947f54 100644 --- a/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm +++ b/modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm @@ -3,8 +3,8 @@ var/taur_icon //leave null if the genital doesn't have a taur counterpart. var/accepted_taurs = STYLE_HOOF_TAURIC|STYLE_PAW_TAURIC //Types that match with the accessory. var/feat_taur //the text string of the dna feature to check for those who want to opt out. - var/taur_dimension_y = 0 - var/taur_dimension_x = 0 + var/taur_dimension_y = 32 + var/taur_dimension_x = 32 //DICKS,COCKS,PENISES,WHATEVER YOU WANT TO CALL THEM