mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 21:53:55 +00:00
unsquishes minitest and adds emote stuff from main (#2949)
* unsquishes minitest and adds laugh stuff from main 🆑 fix: unsquishes minitest (dev) add: adds laugh sounds from main add: adds a *nyaha emote separately /🆑 * add a help entry bc why not * trailing newlines for linters * ports screaming from main * ports spam_flag from main * this is better than having a separate PR and using the living.dm stuff * after maint talk, better that this doesnt exist until it can be implemented nicer
This commit is contained in:
buffyuwu
GitHub
13493
maps/citadel_minitest/citadel_minitest-1.dmm
Normal file
13493
maps/citadel_minitest/citadel_minitest-1.dmm
Normal file
File diff suppressed because it is too large
Load Diff
10966
maps/citadel_minitest/citadel_minitest-sector-2.dmm
Normal file
10966
maps/citadel_minitest/citadel_minitest-sector-2.dmm
Normal file
File diff suppressed because it is too large
Load Diff
10488
maps/citadel_minitest/citadel_minitest-sector-3.dmm
Normal file
10488
maps/citadel_minitest/citadel_minitest-sector-3.dmm
Normal file
File diff suppressed because it is too large
Load Diff
19
maps/citadel_minitest/citadel_minitest.dm
Normal file
19
maps/citadel_minitest/citadel_minitest.dm
Normal file
@@ -0,0 +1,19 @@
|
||||
#if !defined(USING_MAP_DATUM)
|
||||
|
||||
#include "citadel_minitest-1.dmm"
|
||||
#include "citadel_minitest-sector-2.dmm"
|
||||
#include "citadel_minitest-sector-3.dmm"
|
||||
|
||||
#include "citadel_minitest_defines.dm"
|
||||
#include "citadel_minitest_shuttles.dm"
|
||||
#include "citadel_minitest_sectors.dm"
|
||||
|
||||
#define USING_MAP_DATUM /datum/map/citadel_minitest
|
||||
|
||||
#warning Please uncheck citadel_minitest.dm before committing.
|
||||
|
||||
#elif !defined(MAP_OVERRIDE)
|
||||
|
||||
#warn A map has already been included, ignoring Citadel_minitest
|
||||
|
||||
#endif
|
||||
76
maps/citadel_minitest/citadel_minitest_defines.dm
Normal file
76
maps/citadel_minitest/citadel_minitest_defines.dm
Normal file
@@ -0,0 +1,76 @@
|
||||
|
||||
#define Z_LEVEL_MAIN_CITADEL_TESTING 1
|
||||
|
||||
/datum/map/citadel_minitest
|
||||
name = "Virgo_minitest"
|
||||
full_name = "NSS Citadel Testing Facility"
|
||||
path = "citadel_minitest"
|
||||
|
||||
lobby_icon = 'icons/misc/title_vr.dmi'
|
||||
lobby_screens = list("minitest1", "minitest2")
|
||||
id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' //CITADEL CHANGE: Ignore this line because it's going to be overriden in modular_citadel\maps\tether\tether_defines.dm //TODO Remove/Fix these unneccessary Override Overrides everywhere ffs - Zandario
|
||||
|
||||
admin_levels = list()
|
||||
sealed_levels = list()
|
||||
empty_levels = list()
|
||||
station_levels = list(Z_LEVEL_MAIN_CITADEL_TESTING)
|
||||
contact_levels = list(Z_LEVEL_MAIN_CITADEL_TESTING)
|
||||
player_levels = list(Z_LEVEL_MAIN_CITADEL_TESTING)
|
||||
|
||||
accessible_z_levels = list("1" = 100) // The defines can't be used here sadly. // For now.
|
||||
base_turf_by_z = list("1" = /turf/space)
|
||||
|
||||
use_overmap = TRUE
|
||||
/var/overmap_size = 20 // Dimensions of overmap zlevel if overmap is used.
|
||||
/var/overmap_z = 0 // If 0 will generate overmap zlevel on init. Otherwise will populate the zlevel provided.
|
||||
/var/overmap_event_areas = 15 // How many event "clouds" will be generated
|
||||
|
||||
station_name = "NSS Citadel Testing Facility"
|
||||
station_short = "NSS-CTF"
|
||||
dock_name = "NSS-CTF CC"
|
||||
dock_type = "surface"
|
||||
boss_name = "Central Command-Testing"
|
||||
boss_short = "CentCom-Testing"
|
||||
company_name = "NanoTrasen-Testing"
|
||||
company_short = "NT-Testing"
|
||||
starsys_name = "Virgo-Erigone-Testing"
|
||||
|
||||
shuttle_name = "NAS |Hawking|"
|
||||
shuttle_docked_message = "Test Shuttle Docked"
|
||||
shuttle_leaving_dock = "Test Shuttle Leaving"
|
||||
shuttle_called_message = "Test Shuttle Coming"
|
||||
shuttle_recall_message = "Test Shuttle Cancelled"
|
||||
|
||||
emergency_shuttle_docked_message = "Test E-Shuttle Docked"
|
||||
emergency_shuttle_leaving_dock = "Test E-Shuttle Left"
|
||||
emergency_shuttle_called_message = "Test E-Shuttle Coming"
|
||||
emergency_shuttle_recall_message = "Test E-Shuttle Cancelled"
|
||||
|
||||
station_networks = list(
|
||||
NETWORK_CARGO,
|
||||
NETWORK_CIVILIAN,
|
||||
NETWORK_COMMAND,
|
||||
NETWORK_ENGINE,
|
||||
NETWORK_ENGINEERING,
|
||||
NETWORK_ENGINEERING_OUTPOST,
|
||||
NETWORK_DEFAULT,
|
||||
NETWORK_MEDICAL,
|
||||
NETWORK_MINE,
|
||||
NETWORK_NORTHERN_STAR,
|
||||
NETWORK_RESEARCH,
|
||||
NETWORK_RESEARCH_OUTPOST,
|
||||
NETWORK_ROBOTS,
|
||||
NETWORK_PRISON,
|
||||
NETWORK_SECURITY,
|
||||
NETWORK_INTERROGATION
|
||||
)
|
||||
|
||||
allowed_spawns = list("Arrivals Shuttle")
|
||||
|
||||
|
||||
/datum/map/citadel_minitest/perform_map_generation()
|
||||
/*
|
||||
new /datum/random_map/automata/cave_system(null, 1, 1, Z_LEVEL_MAIN_CITADEL_TESTING, world.maxx, world.maxy)
|
||||
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_MAIN_CITADEL_TESTING, 64, 64)
|
||||
*/
|
||||
return 1
|
||||
53
maps/citadel_minitest/citadel_minitest_sectors.dm
Normal file
53
maps/citadel_minitest/citadel_minitest_sectors.dm
Normal file
@@ -0,0 +1,53 @@
|
||||
// This is where Overmap stuff itself is defined
|
||||
|
||||
/obj/effect/overmap/visitable/sector/citadel_minitest/station
|
||||
name = "Minitest Station" // Name of the location on the overmap.
|
||||
desc = "The Citadel Minitest Station. A small base useful for testing and loading quickly!" // The description of the location on the overmap.
|
||||
base = 1 // Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays
|
||||
start_x = 10 // The X Value of where the Navpoint is on the Overmap
|
||||
start_y = 10 // The Y Value of where the Navpoint is on the Overmap
|
||||
// The waypoints that are avaliable once you are at this Navpoint
|
||||
initial_generic_waypoints = list("nav_shared_space", "nav_station_inside", "nav_station_docking1", "nav_station_docking2")
|
||||
|
||||
/obj/effect/overmap/visitable/sector/citadel_minitest/carpfarm
|
||||
name = "Carp Farm"
|
||||
desc = "Abandond space carp farming facility."
|
||||
start_x = 12
|
||||
start_y = 7
|
||||
|
||||
/obj/effect/overmap/visitable/sector/citadel_minitest/beach
|
||||
name = "Beach Planet"
|
||||
desc = "A beach in space. Or on a planet. Its a hack."
|
||||
in_space = 0
|
||||
start_x = 8
|
||||
start_y = 16
|
||||
|
||||
|
||||
//
|
||||
// Overmap Shuttle Demo
|
||||
//
|
||||
|
||||
/datum/shuttle/autodock/overmap/overmapdemo
|
||||
name = "Overmap-Demo"
|
||||
warmup_time = 0
|
||||
shuttle_area = /area/shuttle/overmapdemo
|
||||
current_location = "nav_station_docking2"
|
||||
docking_controller_tag = "overmapdemo_docker"
|
||||
fuel_consumption = 0 // Override to infinate fuel for now.
|
||||
|
||||
/area/shuttle/overmapdemo
|
||||
name = "Overmap-Demo Suttle"
|
||||
music = "music/escape.ogg"
|
||||
icon_state = "shuttle"
|
||||
|
||||
|
||||
//
|
||||
// Making Overmap Shuttle into a Landable Ship
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/overmapdemo
|
||||
name = "VSS Overmap Demo"
|
||||
desc = "Small little shuttle nonetheless capable of overmap travel!"
|
||||
vessel_mass = 5000
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
shuttle = "Overmap-Demo"
|
||||
177
maps/citadel_minitest/citadel_minitest_shuttles.dm
Normal file
177
maps/citadel_minitest/citadel_minitest_shuttles.dm
Normal file
@@ -0,0 +1,177 @@
|
||||
/*
|
||||
** Shared Landmark Defs
|
||||
*/
|
||||
|
||||
// Shared landmark for docking at the station
|
||||
/obj/effect/shuttle_landmark/station_dockpoint1
|
||||
name = "Station Docking Point 1"
|
||||
landmark_tag = "nav_station_docking1"
|
||||
docking_controller = "station_dock1"
|
||||
base_turf = /turf/space
|
||||
base_area = /area/space
|
||||
|
||||
/obj/effect/shuttle_landmark/station_dockpoint2
|
||||
name = "Station Docking Point 2"
|
||||
landmark_tag = "nav_station_docking2"
|
||||
docking_controller = "station_dock2"
|
||||
base_turf = /turf/space
|
||||
base_area = /area/space
|
||||
|
||||
// Shared landmark for docking *inside* the station
|
||||
/obj/effect/shuttle_landmark/station_inside
|
||||
name = "Internal Hangar"
|
||||
landmark_tag = "nav_station_inside"
|
||||
docking_controller = "station_hangar"
|
||||
base_turf = /turf/simulated/floor/tiled
|
||||
base_area = /area/bridge
|
||||
|
||||
/obj/effect/shuttle_landmark/shared_space
|
||||
name = "Somewhere In Space"
|
||||
landmark_tag = "nav_shared_space"
|
||||
base_turf = /turf/space
|
||||
base_area = /area/space
|
||||
|
||||
//
|
||||
// Ferry Demo Shuttle
|
||||
//
|
||||
|
||||
/datum/shuttle/autodock/ferry/ferrydemo
|
||||
name = "Ferry-Demo"
|
||||
warmup_time = 0
|
||||
shuttle_area = /area/shuttle/ferrydemo
|
||||
docking_controller_tag = "ferrydemo_shuttle"
|
||||
landmark_station = "nav_station_docking1"
|
||||
landmark_offsite = "nav_ferrydemo_space"
|
||||
|
||||
/area/shuttle/ferrydemo
|
||||
name = "Ferry-Demo Suttle"
|
||||
music = "music/escape.ogg"
|
||||
icon_state = "shuttle"
|
||||
|
||||
/obj/effect/shuttle_landmark/ferrydemo_space
|
||||
name = "Ferry-Demo Space Hover Point"
|
||||
landmark_tag = "nav_ferrydemo_space"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
/obj/effect/shuttle_landmark/transit/ferrydemo_transit
|
||||
name = "Ferry-Demo Transient Point"
|
||||
landmark_tag = "nav_ferrydemo_transit"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
// /obj/machinery/computer/shuttle_control/power_change()
|
||||
// log_debug("[src].power_change() - area=[get_area(src)] powered=[powered(power_channel)]")
|
||||
// . = ..()
|
||||
|
||||
|
||||
//
|
||||
// MULTI DEMO SHUTTLE
|
||||
//
|
||||
|
||||
/datum/shuttle/autodock/multi/multidemo
|
||||
name = "Multi-Demo"
|
||||
warmup_time = 0
|
||||
shuttle_area = /area/shuttle/multidemo
|
||||
docking_controller_tag = "multidemo_shuttle"
|
||||
current_location = "nav_multidemo_start"
|
||||
destination_tags = list("nav_station_docking2", "nav_shared_space", "nav_station_docking1", "nav_multidemo_nearby")
|
||||
can_cloak = TRUE
|
||||
|
||||
/area/shuttle/multidemo
|
||||
name = "Multi-Demo Suttle"
|
||||
music = "music/escape.ogg"
|
||||
icon_state = "shuttlegrn"
|
||||
|
||||
/obj/effect/shuttle_landmark/multidemo_start
|
||||
name = "Multi-Demo Starting Point"
|
||||
landmark_tag = "nav_multidemo_start"
|
||||
base_turf = /turf/space
|
||||
base_area = /area/space
|
||||
|
||||
/obj/effect/shuttle_landmark/multidemo_nearby
|
||||
name = "Multi-Demo Nearby"
|
||||
landmark_tag = "nav_multidemo_nearby"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
/obj/effect/shuttle_landmark/transit/multidemo_transit
|
||||
name = "Multi-Demo Transient Point"
|
||||
landmark_tag = "nav_multidemo_transit"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
|
||||
//
|
||||
// WEB DEMO SHUTTLE
|
||||
//
|
||||
|
||||
/area/shuttle/webdemo
|
||||
name = "Web-Demo Suttle"
|
||||
icon_state = "shuttlered"
|
||||
music = "music/escape.ogg"
|
||||
|
||||
/datum/shuttle/autodock/web_shuttle/webdemo
|
||||
name = "Web-Demo"
|
||||
warmup_time = 0
|
||||
shuttle_area = /area/shuttle/webdemo
|
||||
current_location = "nav_station_inside"
|
||||
docking_controller_tag = "webdemo_docker"
|
||||
web_master_type = /datum/shuttle_web_master/webdemo
|
||||
|
||||
/datum/shuttle_web_master/webdemo
|
||||
destination_class = /datum/shuttle_destination/webdemo
|
||||
starting_destination = /datum/shuttle_destination/webdemo/inside_bridge
|
||||
|
||||
//
|
||||
// inside_bridge--\
|
||||
// |---nearby_bridge---faraway
|
||||
// docked_bridge--/
|
||||
//
|
||||
|
||||
/datum/shuttle_destination/webdemo/inside_bridge
|
||||
name = "inside the Bridge"
|
||||
my_landmark = "nav_station_inside"
|
||||
radio_announce = TRUE
|
||||
announcer = "Shuttle Authority"
|
||||
|
||||
/datum/shuttle_destination/webdemo/inside_bridge/get_arrival_message()
|
||||
return "Attention, [master.my_shuttle.visible_name] has arrived at the [name]."
|
||||
|
||||
/datum/shuttle_destination/webdemo/inside_bridge/get_departure_message()
|
||||
return "Attention, [master.my_shuttle.visible_name] has departed from [name]."
|
||||
|
||||
|
||||
/datum/shuttle_destination/webdemo/docked_bridge
|
||||
name = "Bridge docking pylon"
|
||||
my_landmark = "nav_station_docking1"
|
||||
radio_announce = TRUE
|
||||
announcer = "Shuttle Authority"
|
||||
|
||||
/datum/shuttle_destination/webdemo/docked_bridge/get_arrival_message()
|
||||
return "Attention, [master.my_shuttle.visible_name] has arrived at [name]."
|
||||
|
||||
/datum/shuttle_destination/webdemo/docked_bridge/get_departure_message()
|
||||
return "Attention, [master.my_shuttle.visible_name] has departed from [name]."
|
||||
|
||||
|
||||
/obj/effect/shuttle_landmark/transit/webdemo_transit
|
||||
name = "Web-Demo Transient Point"
|
||||
landmark_tag = "nav_webdemo_transit"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
/datum/shuttle_destination/webdemo/nearby_bridge
|
||||
name = "nearby the Bridge"
|
||||
my_landmark = "nav_shared_space"
|
||||
preferred_interim_tag = "nav_webdemo_transit"
|
||||
routes_to_make = list(
|
||||
/datum/shuttle_destination/webdemo/inside_bridge = 0,
|
||||
/datum/shuttle_destination/webdemo/docked_bridge = 0,
|
||||
/datum/shuttle_destination/webdemo/faraway = 30 SECONDS
|
||||
)
|
||||
|
||||
/obj/effect/shuttle_landmark/webdemo_faraway
|
||||
name = "\"Deep\" Space"
|
||||
landmark_tag = "nav_webdemo_faraway"
|
||||
flags = SLANDMARK_FLAG_AUTOSET
|
||||
|
||||
/datum/shuttle_destination/webdemo/faraway
|
||||
name = "far away"
|
||||
my_landmark = "nav_webdemo_faraway"
|
||||
preferred_interim_tag = "nav_webdemo_transit"
|
||||
Reference in New Issue
Block a user