fixes
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
outdoors = TRUE
|
||||
flags_1 = NONE
|
||||
ambientsounds = MINING
|
||||
flora_allowed FALSE
|
||||
flora_allowed = FALSE
|
||||
|
||||
/area/mine/unexplored
|
||||
name = "Mine"
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
if(!newloc.Enter(src, src.loc))
|
||||
return
|
||||
|
||||
if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
|
||||
return
|
||||
|
||||
// Past this is the point of no return
|
||||
var/atom/oldloc = loc
|
||||
var/area/oldarea = get_area(oldloc)
|
||||
|
||||
@@ -183,3 +183,47 @@
|
||||
else
|
||||
real_target = get_turf(linked)
|
||||
return real_target
|
||||
|
||||
/obj/effect/portal/permanent
|
||||
name = "permanent portal"
|
||||
desc = "An unwavering portal that will never fade."
|
||||
hardlinked = FALSE // dont qdel my portal nerd
|
||||
force_teleport = TRUE // force teleports because they're a mapmaker tool
|
||||
var/id // var edit or set id in map editor
|
||||
|
||||
/obj/effect/portal/permanent/proc/set_linked()
|
||||
if(!id)
|
||||
return
|
||||
for(var/obj/effect/portal/permanent/P in GLOB.portals - src)
|
||||
if(P.id == id)
|
||||
P.linked = src
|
||||
linked = P
|
||||
break
|
||||
|
||||
/obj/effect/portal/permanent/teleport(atom/movable/M, force = FALSE)
|
||||
set_linked() // update portal links
|
||||
. = ..()
|
||||
|
||||
/obj/effect/portal/permanent/one_way // doesn't have a return portal, can have multiple exits, /obj/effect/landmark/portal_exit to mark them
|
||||
name = "one-way portal"
|
||||
desc = "You get the feeling that this might not be the safest thing you've ever done."
|
||||
|
||||
/obj/effect/portal/permanent/one_way/set_linked()
|
||||
if(!id)
|
||||
return
|
||||
var/list/possible_turfs = list()
|
||||
for(var/obj/effect/landmark/portal_exit/PE in GLOB.landmarks_list)
|
||||
if(PE.id == id)
|
||||
var/turf/T = get_turf(PE)
|
||||
if(T)
|
||||
possible_turfs |= T
|
||||
if(possible_turfs.len)
|
||||
hard_target = pick(possible_turfs)
|
||||
|
||||
/obj/effect/portal/permanent/one_way/one_use
|
||||
name = "one-use portal"
|
||||
desc = "This is probably the worst decision you'll ever make in your life."
|
||||
|
||||
/obj/effect/portal/permanent/one_way/one_use/teleport(atom/movable/M, force = FALSE)
|
||||
. = ..()
|
||||
qdel(src)
|
||||
|
||||
@@ -228,7 +228,7 @@
|
||||
if (!megafauna_spawn_list)
|
||||
megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM)
|
||||
if (!flora_spawn_list)
|
||||
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
|
||||
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/azsh/tall_shroom = 2)
|
||||
|
||||
. = ..()
|
||||
if(!has_data)
|
||||
|
||||
Reference in New Issue
Block a user