cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hand tele tweaks (#21224)

Browse Source 
* hand tele tweaks

* i need to sleep

* updated portal description, removed hand tele ability to remove portals

* added disabled icon state, removed dual portals

* syndi teleporter stages + icons

* Update code/game/objects/items/weapons/teleportation.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/teleportation.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/effects/portals.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* resolving conflict

* no more races

* Update code/game/objects/items/weapons/teleportation.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
HMBGERDO
2023-07-07 13:57:56 +01:00
committed by GitHub
co-authored by Luc
parent 6872e5257d
commit 62a2c82eab
4 changed files with 87 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/portals.dm
+43 -3
View File
@@ -2,7 +2,7 @@
/obj/effect/portal
name = "portal"
desc = "Looks unstable. Best to test it with the clown."
desc = "Result of bluespace high tech development."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "portal"
@@ -12,10 +12,11 @@
/// The ckey of the mob which was responsible for the creation of the portal. For example, the mob who used a wormhole jaunter.
var/creation_mob_ckey
var/failchance = 5
var/failchance = 0
var/fail_icon = "portal1"
var/precision = TRUE // how close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent
/// How close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent
var/precision = FALSE
var/can_multitool_to_remove = FALSE
var/ignore_tele_proof_area_setting = FALSE
var/one_use = FALSE // Does this portal go away after one teleport?
@@ -43,6 +44,7 @@
if(!QDELETED(O))
O.portal_destroyed(src)
target = null
do_sparks(5, 0, loc)
return ..()
/obj/effect/portal/singularity_pull()
@@ -143,6 +145,44 @@
do_sparks(5, 0, loc)
qdel(src)
#define UNSTABLE_TIME_DELAY 2 SECONDS
/obj/effect/portal/hand_tele
/// After you touch the portal, it will be unstable with high bad teleport chance, this variable contains time when it will be fine again
var/unstable_time = 0
/// If this is TRUE, you will not be able to teleport with that portal
var/inactive = FALSE
/obj/effect/portal/hand_tele/examine(mob/user, infix, suffix)
. = ..()
if(unstable_time > world.time)
. += "<span class='warning'>[src] is shaking, it looks very unstable!</span>"
/obj/effect/portal/hand_tele/can_teleport(atom/movable/M)
if(inactive)
return FALSE
return ..()
/obj/effect/portal/hand_tele/teleport(atom/movable/M)
. = ..()
adjust_unstable()
/obj/effect/portal/hand_tele/proc/adjust_unstable()
unstable_time = world.time + UNSTABLE_TIME_DELAY
icon_state = fail_icon
failchance = 33
inactive = TRUE
addtimer(CALLBACK(src, PROC_REF(check_unstable), unstable_time), UNSTABLE_TIME_DELAY)
addtimer(VARSET_CALLBACK(src, inactive, FALSE), 0.5 SECONDS) // after unstable is setted you have 0.5 safe seconds to think if you want to use it
/obj/effect/portal/hand_tele/proc/check_unstable(current_unstable_time)
if(current_unstable_time != unstable_time)
return
icon_state = initial(icon_state)
failchance = 0
#undef UNSTABLE_TIME_DELAY
/obj/effect/portal/redspace
name = "redspace portal"
desc = "A portal capable of bypassing bluespace interference."