cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Various QoL (#12720)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-05-01 00:49:39 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 72d0a4f8ff
commit e763f2dff1
15 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/translocator_vr.dm
+10 -6
View File
@@ -97,6 +97,9 @@
else
return ..()
/obj/item/perfect_tele/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
afterattack(M, user)
/obj/item/perfect_tele/proc/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0)
if(battery_lock)
to_chat(user,span_notice("[src] does not have a battery port."))
@@ -254,9 +257,11 @@ This device records all warnings given and teleport events for admin review in c
//Seems okay to me!
return TRUE
/obj/item/perfect_tele/afterattack(mob/living/target, mob/living/user, proximity, var/ignore_fail_chance = 0)
/obj/item/perfect_tele/afterattack(mob/living/target, mob/user, proximity_flag, click_parameters, ignore_fail_chance = 0)
//No, you can't teleport people from over there.
if(!proximity)
if(!user.Adjacent(target) && !proximity_flag)
return
if(!istype(target))
return
if(!teleport_checks(target,user))
@@ -310,14 +315,13 @@ This device records all warnings given and teleport events for admin review in c
var/televored = FALSE
if(isbelly(real_dest))
var/obj/belly/B = real_dest
// CHOMPEdit Start - Making pref checks work properly
if(target.devourable && target.can_be_drop_prey && B.owner != target)
televored = TRUE
to_chat(target,span_vwarning("\The [src] teleports you right into \a [lowertext(real_dest.name)]!"))
to_chat(target, span_vwarning("\The [src] teleports you right into \a [lowertext(real_dest.name)]!"))
else
to_chat(target,span_vwarning("\The [src] narrowly avoids teleporting you right into \a [lowertext(real_dest.name)]!"))
to_chat(target, span_vwarning("\The [src] narrowly avoids teleporting you right into \a [lowertext(real_dest.name)]!"))
real_dest = dT //Nevermind!
// CHOMPEdit End
//Phase-out effect
phase_out(target,get_turf(target))