From c4341992d15b1d019101bbbcc961df4ff095cd90 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 22 Oct 2015 21:52:20 -0400 Subject: [PATCH] last tweaks --- code/game/gamemodes/wizard/artefact.dm | 6 +++++- code/modules/admin/verbs/onlyone.dm | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 97cdc43c189..3008d2db0c7 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -251,7 +251,7 @@ var/global/list/multiverse = list() return ..() /obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. - if(M.faction == user.faction) + if(M.real_name == user.real_name) user << "The [src] detects benevolent energies in your target and redirects your attack!" return ..() @@ -427,6 +427,9 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(sword, slot_r_hand) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords. else + if(M.get_species() == "Tajaran" || M.get_species() == "Unathi") + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) //If they can't wear shoes, give them a pair of sandals. + var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") switch(randomize) @@ -577,6 +580,7 @@ var/global/list/multiverse = list() W.assignment = "Multiverse Traveller" W.registered_name = M.real_name W.update_label(M.real_name) + W.SetOwnerInfo(M) M.equip_to_slot_or_del(W, slot_wear_id) M.update_icons() diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index ca404f5cfc5..97e7f716a3c 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -96,6 +96,8 @@ W.update_label(H.real_name) H.equip_to_slot_or_del(W, slot_wear_id) + H.update_icons() + message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ME! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1) log_admin("[key_name(usr)] used there can be only me.") nologevent = 1