Merge pull request #9738 from VOREStation/twologfix

Two fixes for messages I noticed in logs
This commit is contained in:
Novacat
2021-02-17 10:40:37 -05:00
committed by Chompstation Bot
parent e7ca4001ac
commit 9e5a5c4c46
3 changed files with 13 additions and 10 deletions

View File

@@ -22,11 +22,12 @@
/obj/item/weapon/cane/concealed
var/concealed_blade
/obj/item/weapon/cane/concealed/New()
..()
/obj/item/weapon/cane/concealed/Initialize()
. = ..()
var/obj/item/weapon/material/butterfly/switchblade/temp_blade = new(src)
concealed_blade = temp_blade
temp_blade.attack_self()
temp_blade.active = TRUE
temp_blade.update_force()
/obj/item/weapon/cane/concealed/attack_self(var/mob/user)
var/datum/gender/T = gender_datums[user.get_visible_gender()]

View File

@@ -45,12 +45,14 @@
/obj/item/weapon/material/butterfly/attack_self(mob/user)
active = !active
update_force()
if(user)
if(active)
to_chat(user, "<span class='notice'>You flip out \the [src].</span>")
playsound(src, 'sound/weapons/flipblade.ogg', 15, 1)
else
to_chat(user, "<span class='notice'>\The [src] can now be concealed.</span>")
update_force()
add_fingerprint(user)
/*

View File

@@ -23,7 +23,7 @@
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
to_chat(F, "<span class='filter_adminlog'><small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br></span>")
to_file(F, "<span class='filter_adminlog'><small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br></span>")
//ADMINVERBS
/client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") )