From 2891dc3ea7d139faf4b69962a3f6914bf0692898 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 12 Feb 2023 13:20:23 -0500 Subject: [PATCH] Merge pull request #14476 from Heroman3003/runtime-17 Runtime fixes --- code/modules/client/preference_setup/vore/08_nif.dm | 2 +- code/modules/paperwork/pen.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/vore/08_nif.dm b/code/modules/client/preference_setup/vore/08_nif.dm index c618341344..96b521ecfe 100644 --- a/code/modules/client/preference_setup/vore/08_nif.dm +++ b/code/modules/client/preference_setup/vore/08_nif.dm @@ -35,7 +35,7 @@ /datum/category_item/player_setup_item/vore/nif/copy_to_mob(var/mob/living/carbon/human/character) //If you had a NIF... - if((character.type == /mob/living/carbon/human) && ispath(pref.nif_path) && pref.nif_durability) + if((character.type == /mob/living/carbon/human && !(character.mind.assigned_role == "Cyborg" || character.mind.assigned_role == "AI")) && ispath(pref.nif_path) && pref.nif_durability) new pref.nif_path(character,pref.nif_durability,pref.nif_savedata) /* diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 5409fbb2c1..b7190b95c6 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -27,6 +27,7 @@ throw_speed = 7 throw_range = 15 matter = list(MAT_STEEL = 10) + attack_verb = list("stabbed") var/colour = "black" //what colour the ink is! pressure_resistance = 2 drop_sound = 'sound/items/drop/accessory.ogg' @@ -225,6 +226,7 @@ w_class = initial(w_class) damtype = BRUTE catchable = TRUE + attack_verb = initial(attack_verb) /obj/item/weapon/pen/blade/blue desc = "It's a normal blue ink pen."