diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index be57d420b3..b9052495d0 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -573,7 +573,7 @@ ..() /obj/machinery/porta_turret/proc/attempt_retaliate(incoming_damage) - if(attacked || !enabled || emagged || incoming_damage < 1) //if the force of impact dealt at least 1 damage, the turret gets pissed off + if(QDELETED(src) || attacked || !enabled || emagged || incoming_damage < 1) //if the force of impact dealt at least 1 damage, the turret gets pissed off return if(stat & (NOPOWER|BROKEN)) return diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 4d7aa5e74c..d3a898266a 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -26,7 +26,9 @@ save_data["runechat_color"] = pref.runechat_color /datum/category_item/player_setup_item/general/language/sanitize_character() + #ifdef TESTING var/char_name = pref.read_preference(/datum/preference/name/real_name) || "-name not yet loaded-" + #endif if(!islist(pref.alternate_languages)) testing("LANGSANI: Sanitizing languages on [pref.client]'s character [char_name] because their character has no languages list") pref.alternate_languages = list() diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 0b4477038b..e5db96c4a6 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -273,7 +273,8 @@ /obj/item/clothing/head/psy_crown/proc/activate_ability(var/mob/living/wearer) cooldown = world.time + cooldown_duration - to_chat(wearer, flavor_activate) + if(flavor_activate) + to_chat(wearer, flavor_activate) to_chat(wearer, span_danger("The inside of your head hurts...")) wearer.adjustBrainLoss(brainloss_cost) @@ -281,15 +282,18 @@ ..() if(istype(H) && H.head == src && H.is_sentient()) START_PROCESSING(SSobj, src) - to_chat(H, flavor_equip) + if(flavor_equip) + to_chat(H, flavor_equip) /obj/item/clothing/head/psy_crown/dropped(var/mob/living/carbon/human/H) ..() STOP_PROCESSING(SSobj, src) if(H.is_sentient()) if(loc == H) // Still inhand. - to_chat(H, flavor_unequip) - else + if(flavor_unequip) + to_chat(H, flavor_unequip) + return + if(flavor_drop) to_chat(H, flavor_drop) /obj/item/clothing/head/psy_crown/Destroy() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm index cd6423bbf6..db3f1d0e8d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm @@ -94,8 +94,8 @@ add_overlay(image(icon = 'icons/mecha/mecha_equipment.dmi', icon_state = "repair_droid")) /mob/living/simple_mob/mechanical/mecha/bullet_act() - . = ..() sparks.start() + . = ..() /mob/living/simple_mob/mechanical/mecha/speech_bubble_appearance() return pilot_type ? "" : ..()