From e3d3693a97ea872b629fbd5fc6075b85cafff3d7 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 21 Aug 2022 15:38:01 -0400 Subject: [PATCH 1/2] Increases bluespace interferance --- code/datums/helper_datums/teleport.dm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 956adec1fb..84f08b0ff8 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -1,3 +1,10 @@ +var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, +/obj/item/weapon/storage/bag/trash/holding, +/obj/item/weapon/storage/pouch/holding, +/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/medical/holding +) + //wrapper /proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE, bohsafe=FALSE) //CHOMPStation Edit new /datum/teleport/instant/science(arglist(args)) @@ -157,21 +164,32 @@ /datum/teleport/instant/science/setPrecision(aprecision) ..() +<<<<<<< HEAD if(bohsafe) return 1 if(istype(teleatom, /obj/item/weapon/storage/backpack/holding)) precision = rand(1,100) +======= +>>>>>>> aa6ad575e0... Merge pull request #13535 from lm40/nofun + + var/list/bluespace_things = newlist() + + for (var/item in bluespace_item_types) + if (istype(teleatom, item)) + precision = rand(1, 100) + bluespace_things |= teleatom.search_contents_for(item) - var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding) //VOREStation Addition Start: Prevent taurriding abuse if(istype(teleatom, /mob/living)) var/mob/living/L = teleatom if(LAZYLEN(L.buckled_mobs)) for(var/mob/rider in L.buckled_mobs) - bagholding += rider.search_contents_for(/obj/item/weapon/storage/backpack/holding) + for (var/item in bluespace_item_types) + bluespace_things |= rider.search_contents_for(item) //VOREStation Addition End: Prevent taurriding abuse - if(bagholding.len) - precision = max(rand(1,100)*bagholding.len,100) + + if(bluespace_things.len) + precision = max(rand(1,100)*bluespace_things.len,100) if(istype(teleatom, /mob/living)) var/mob/living/MM = teleatom to_chat(MM, "The Bluespace interface on your [teleatom] interferes with the teleport!") From 35288a7cdb29e7a110c5efd3772df66287af53cc Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 28 Aug 2022 18:41:33 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/datums/helper_datums/teleport.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 84f08b0ff8..270f52410c 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -164,13 +164,8 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, /datum/teleport/instant/science/setPrecision(aprecision) ..() -<<<<<<< HEAD - if(bohsafe) - return 1 - if(istype(teleatom, /obj/item/weapon/storage/backpack/holding)) - precision = rand(1,100) -======= ->>>>>>> aa6ad575e0... Merge pull request #13535 from lm40/nofun + if(bohsafe) //CHOMPedit + return 1 //CHOMPedit var/list/bluespace_things = newlist() @@ -244,4 +239,4 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, return 0 else return 1 - //VOREStation Edit End \ No newline at end of file + //VOREStation Edit End