mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Merge branch 'fixjaunters' into 'Bleeding-Edge'
Fixes a jaunter runtime. Jaunters now work correctly. sleep in New() was halting the proc, so it would delete the portal and then try setting its target See merge request !136
This commit is contained in:
@@ -414,10 +414,6 @@
|
||||
icon_state = "bhole3"
|
||||
desc = "A stable hole in the universe made by a wormhole jaunter. Turbulent doesn't even begin to describe how rough passage through one of these is, but at least it will always get you somewhere near a beacon."
|
||||
|
||||
/obj/effect/portal/jaunt_tunnel/New()
|
||||
sleep(300) // 30s
|
||||
qdel(src)
|
||||
|
||||
/*/obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M)
|
||||
if(istype(M, /obj/effect))
|
||||
return
|
||||
|
||||
12
html/changelogs/Intigracy_jauntersfix.yml
Normal file
12
html/changelogs/Intigracy_jauntersfix.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
# Your name.
|
||||
author: Intigracy
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
|
||||
changes:
|
||||
- bugfix: Fixed jaunters. They now delete when you spawn the portal, and the portal actually works.
|
||||
Reference in New Issue
Block a user