Add adminload Spa map, tweaks

Add a Spa map, mostly to use for events. Tweak teleporter to work better with adminloaded templates and things like that.
This commit is contained in:
Arokha Sieyes
2018-02-21 21:58:00 -05:00
parent 14ebc2712e
commit 86b087bee0
4 changed files with 2799 additions and 8 deletions

View File

@@ -175,7 +175,7 @@
else
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
/* VOREStation Removal
if(destination.z in using_map.admin_levels) //CentCom z-level
if(istype(teleatom, /obj/mecha))
var/obj/mecha/MM = teleatom
@@ -184,8 +184,11 @@
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
if(destination.z > max_default_z_level()) //Away mission z-levels
return 0
return 1
*/ //VOREStation Removal End
//VOREStation Edit Start
if(destination.z in using_map.player_levels)
return 1
if(istype(teleatom, /mob/living))
to_chat(teleatom, "<span class='warning'>The portal refuses to carry you that far away!</span>")
return 0
//VOREStation Edit End

View File

@@ -31,8 +31,8 @@
#include "beach/beach.dmm"
#include "beach/cave.dmm"
#include "alienship/alienship.dmm"
//#include "aerostat/aerostat.dmm"
//#include "aerostat/surface.dmm"
#include "aerostat/aerostat.dmm"
#include "aerostat/surface.dmm"
#endif
#include "beach/_beach.dm"
@@ -89,8 +89,23 @@
name = "Away Mission - Aerostat Surface"
//////////////////////////////////////////////////////////////////////////////////////
// Admin-use z-levels for loading whenever an admin feels like
#if AWAY_MISSION_TEST
#include "admin_use/spa.dmm"
#endif
#include "admin_use/fun.dm"
/datum/map_template/tether_lateload/fun/spa
name = "Space Spa"
desc = "A pleasant spa located in a spaceship."
mappath = 'admin_use/spa.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/fun/spa
/datum/map_z_level/tether_lateload/fun/spa
name = "Spa"
flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED
//////////////////////////////////////////////////////////////////////////////////////
// Code Shenanigans for Tether lateload maps

View File

@@ -0,0 +1,26 @@
/area/submap/spa
name = "\improper Space Spa"
requires_power = 0
dynamic_lighting = 0
// NEVER EVER use these on an actual included map.
// These are for admins to use when they make quick maps and upload the .dmm files for loading
// during a round. They're just generic areas so they can use them and have them exist without
// using real map areas.
/area/submap/admin_upload
name = "\improper Unknown Area AU" //Nobody will know what this means if they see it, anyway.
requires_power = 1
dynamic_lighting = 1
/area/submap/admin_upload/pow
name = "\improper Unknown Area AU+P"
requires_power = 0
/area/submap/admin_upload/lit
name = "\improper Unknown Area AU+L"
dynamic_lighting = 0
/area/submap/admin_upload/powlit
name = "\improper Unknown Area AU+PL"
requires_power = 0
dynamic_lighting = 0

File diff suppressed because it is too large Load Diff