From 5e7ec8ea7fd9ed70857d680790abdf096f8650c1 Mon Sep 17 00:00:00 2001 From: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Sun, 24 Apr 2022 15:08:08 +0100 Subject: [PATCH] Fixes some portal logging. (#17655) * fix * pass the user * named arg Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/game/objects/effects/portals.dm | 3 ++- code/game/objects/items/weapons/teleportation.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 43931e6bb2a..9d2cc38ee8a 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -25,7 +25,8 @@ GLOB.portals += src target = _target - creation_obj_data = list(creation_object.UID(), "[creation_object.name]") // Store the name incase the object is deleted. + if(creation_object) + creation_obj_data = list(creation_object.UID(), "[creation_object.name]") // Store the name incase the object is deleted. creation_mob_ckey = creation_mob?.ckey if(lifespan > 0) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 491dd65ec97..2d583a76d2c 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -109,7 +109,7 @@ Frequency: resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/active_portals = 0 -/obj/item/hand_tele/attack_self(mob/user as mob) +/obj/item/hand_tele/attack_self(mob/user) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||!is_teleport_allowed(current_location.z))//If turf was not found or they're somewhere teleproof to_chat(user, "\The [src] is malfunctioning.") @@ -139,7 +139,7 @@ Frequency: return var/T = L[t1] user.show_message("Locked In.", 2) - var/obj/effect/portal/P = new /obj/effect/portal(get_turf(src), T, src) + var/obj/effect/portal/P = new /obj/effect/portal(get_turf(src), T, src, creation_mob = user) try_move_adjacent(P) active_portals++ add_fingerprint(user)