mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
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:
@@ -175,7 +175,7 @@
|
|||||||
else
|
else
|
||||||
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
|
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
|
||||||
return 0
|
return 0
|
||||||
|
/* VOREStation Removal
|
||||||
if(destination.z in using_map.admin_levels) //CentCom z-level
|
if(destination.z in using_map.admin_levels) //CentCom z-level
|
||||||
if(istype(teleatom, /obj/mecha))
|
if(istype(teleatom, /obj/mecha))
|
||||||
var/obj/mecha/MM = teleatom
|
var/obj/mecha/MM = teleatom
|
||||||
@@ -184,8 +184,11 @@
|
|||||||
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
|
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>")
|
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
|
||||||
return 0
|
return 0
|
||||||
|
*/ //VOREStation Removal End
|
||||||
|
//VOREStation Edit Start
|
||||||
if(destination.z > max_default_z_level()) //Away mission z-levels
|
if(destination.z in using_map.player_levels)
|
||||||
return 0
|
return 1
|
||||||
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
|
||||||
@@ -31,8 +31,8 @@
|
|||||||
#include "beach/beach.dmm"
|
#include "beach/beach.dmm"
|
||||||
#include "beach/cave.dmm"
|
#include "beach/cave.dmm"
|
||||||
#include "alienship/alienship.dmm"
|
#include "alienship/alienship.dmm"
|
||||||
//#include "aerostat/aerostat.dmm"
|
#include "aerostat/aerostat.dmm"
|
||||||
//#include "aerostat/surface.dmm"
|
#include "aerostat/surface.dmm"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "beach/_beach.dm"
|
#include "beach/_beach.dm"
|
||||||
@@ -89,8 +89,23 @@
|
|||||||
name = "Away Mission - Aerostat Surface"
|
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
|
// Code Shenanigans for Tether lateload maps
|
||||||
|
|||||||
26
maps/tether/submaps/admin_use/fun.dm
Normal file
26
maps/tether/submaps/admin_use/fun.dm
Normal 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
|
||||||
2747
maps/tether/submaps/admin_use/spa.dmm
Normal file
2747
maps/tether/submaps/admin_use/spa.dmm
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user