From 5b63f0accedb78687ec6416938a7fce75edc3fd2 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Fri, 7 Aug 2020 15:15:34 +0800 Subject: [PATCH] fix fix fix^2 --- code/game/objects/effects/portals.dm | 22 ++++++++----------- code/modules/cargo/console.dm | 4 ++-- .../chemistry/machinery/chem_master.dm | 14 ++++++------ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 0b227be247..a7b5091522 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -1,10 +1,10 @@ -/proc/create_portal_pair(turf/source, turf/destination, _creator = null, _lifespan = 300, accuracy = 0, newtype = /obj/effect/portal, atmos_link_override) +/proc/create_portal_pair(turf/source, turf/destination, _lifespan = 300, accuracy = 0, newtype = /obj/effect/portal, atmos_link_override) if(!istype(source) || !istype(destination)) return var/turf/actual_destination = get_teleport_turf(destination, accuracy) - var/obj/effect/portal/P1 = new newtype(source, _creator, _lifespan, null, FALSE, null, atmos_link_override) - var/obj/effect/portal/P2 = new newtype(actual_destination, _creator, _lifespan, P1, TRUE, null, atmos_link_override) + var/obj/effect/portal/P1 = new newtype(source, _lifespan, null, FALSE, null, atmos_link_override) + var/obj/effect/portal/P2 = new newtype(actual_destination, _lifespan, P1, TRUE, null, atmos_link_override) if(!istype(P1)||!istype(P2)) return P1.link_portal(P2) @@ -21,7 +21,6 @@ var/obj/effect/portal/linked var/hardlinked = TRUE //Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted. var/teleport_channel = TELEPORT_CHANNEL_BLUESPACE - var/creator var/turf/hard_target //For when a portal needs a hard target and isn't to be linked. var/atmos_link = FALSE //Link source/destination atmos. var/turf/open/atmos_source //Atmos link source @@ -35,6 +34,7 @@ name = "wormhole" icon = 'icons/obj/objects.dmi' icon_state = "anom" + layer = RIPPLE_LAYER mech_sized = TRUE teleport_channel = TELEPORT_CHANNEL_WORMHOLE @@ -49,7 +49,9 @@ user.forceMove(get_turf(src)) return TRUE -/obj/effect/portal/Crossed(atom/movable/AM, oldloc) +/obj/effect/portal/Crossed(atom/movable/AM, oldloc, force_stop = 0) + if(force_stop) + return ..() if(isobserver(AM)) return ..() if(linked && (get_turf(oldloc) == get_turf(linked))) @@ -66,7 +68,7 @@ if(Adjacent(user)) user.forceMove(get_turf(src)) -/obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) +/obj/effect/portal/Initialize(mapload, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) . = ..() GLOB.portals += src if(!istype(_linked) && automatic_link) @@ -78,7 +80,6 @@ atmos_link = atmos_link_override link_portal(_linked) hardlinked = automatic_link - creator = _creator if(isturf(hard_target_override)) hard_target = hard_target_override @@ -129,10 +130,7 @@ LAZYREMOVE(atmos_destination.atmos_adjacent_turfs, atmos_source) atmos_destination = null -/obj/effect/portal/Destroy() //Calls on_portal_destroy(destroyed portal, location of destroyed portal) on creator if creator has such call. - if(creator && hascall(creator, "on_portal_destroy")) - call(creator, "on_portal_destroy")(src, src.loc) - creator = null +/obj/effect/portal/Destroy() GLOB.portals -= src unlink_atmos() if(hardlinked && !QDELETED(linked)) @@ -153,8 +151,6 @@ return FALSE if(!force && (!ismecha(M) && !istype(M, /obj/item/projectile) && M.anchored && !allow_anchored)) return - if(ismegafauna(M)) - message_admins("[M] has used a portal at [ADMIN_VERBOSEJMP(src)] made by [usr].") var/no_effect = FALSE if(last_effect == world.time) no_effect = TRUE diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index eb8cdc60de..f5a8d21278 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -211,9 +211,9 @@ if(isnull(reason) || ..()) return - if(pack.goody && !self_paid) + if(pack.goody == PACK_GOODY_PRIVATE && !self_paid) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) - say("ERROR: Small crates may only be purchased by private accounts.") + say("ERROR: Private small crates may only be purchased by private accounts.") return var/obj/item/coupon/applied_coupon diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 39a744df2f..207325e1b3 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -331,7 +331,7 @@ if(P.icon_state == "pill4") P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality." adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "patch") var/obj/item/reagent_containers/pill/patch/P @@ -339,7 +339,7 @@ P = new/obj/item/reagent_containers/pill/patch(drop_location()) P.name = trim("[name] patch") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "bottle") var/obj/item/reagent_containers/glass/bottle/P @@ -347,7 +347,7 @@ P = new/obj/item/reagent_containers/glass/bottle(drop_location()) P.name = trim("[name] bottle") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "condimentPack") var/obj/item/reagent_containers/food/condiment/pack/P @@ -356,7 +356,7 @@ P.originalname = name P.name = trim("[name] pack") P.desc = "A small condiment pack. The label says it contains [name]." - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "condimentBottle") var/obj/item/reagent_containers/food/condiment/P @@ -364,7 +364,7 @@ P = new/obj/item/reagent_containers/food/condiment(drop_location()) P.originalname = name P.name = trim("[name] bottle") - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "hypoVial") var/obj/item/reagent_containers/glass/bottle/vial/small/P @@ -372,7 +372,7 @@ P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location()) P.name = trim("[name] hypovial") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) return TRUE if(item_type == "smartDart") var/obj/item/reagent_containers/syringe/dart/P @@ -380,7 +380,7 @@ P = new /obj/item/reagent_containers/syringe/dart(drop_location()) P.name = trim("[name] SmartDart") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each)//, transfered_by = usr) P.mode=!mode P.update_icon() return TRUE