cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-22 04:28:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14579 from KillianKirilenko/kk-ships

Browse Source 
Ships!
This commit is contained in:
Heroman3003
2023-03-10 16:52:13 +10:00
committed by GitHub
parent 44a53d2dba 9861174a3c
commit 17063fbb69
9 changed files with 3575 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/offmap_vr/common_offmaps.dm
+2
View File
@@ -497,6 +497,8 @@
#include "../offmap_vr/om_ships/curashuttle.dm"
#include "../offmap_vr/om_ships/itglight.dm"
#include "../offmap_vr/om_ships/abductor.dm"
#include "../offmap_vr/om_ships/lunaship.dm"
#include "../offmap_vr/om_ships/sdf_corvettes.dm"
//////////////////////////////////////////////////////////////////////////////
//Capsule deployed ships
maps/offmap_vr/om_ships/gecko_cr.dmm
+4 -4
View File
@@ -1848,8 +1848,8 @@
/obj/effect/floor_decal/industrial/outline/grey,
/obj/machinery/embedded_controller/radio/docking_port_multi{
child_names_txt = "Port Airlock Control;Starboard Airlock Control";
child_tags_txt = "geck_sh_docking_port;geck_sh_docking_star";
id_tag = "geck_sh_docking";
child_tags_txt = "geck_cr_docking_port;geck_cr_docking_star";
id_tag = "geck_cr_docking";
pixel_y = 22
},
/obj/structure/railing/grey{
@@ -2343,7 +2343,7 @@
/obj/machinery/atmospherics/unary/vent_pump,
/obj/structure/handrail,
/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
id_tag = "geck_sh_docking_port";
id_tag = "geck_cr_docking_port";
name = "Port AIrlock Control";
pixel_y = 22
},
@@ -2988,7 +2988,7 @@
/obj/machinery/atmospherics/unary/vent_pump,
/obj/structure/handrail,
/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
id_tag = "geck_sh_docking_star";
id_tag = "geck_cr_docking_star";
name = "Starboard Airlock Control";
pixel_y = 22
},
maps/offmap_vr/om_ships/sdf_corvette.dmm
+1035
View File
File diff suppressed because it is too large Load Diff
maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm
+1236
View File
File diff suppressed because it is too large Load Diff
maps/offmap_vr/om_ships/sdf_corvettes.dm
+141
View File
@@ -0,0 +1,141 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "sdf_corvette.dmm"
#include "sdf_corvette_wreck.dmm"
#include "sdf_cutter.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/sdf_corvette
name = "OM Ship - SDF Corvette (new Z)"
desc = "A small SDF patrol corvette."
mappath = 'sdf_corvette.dmm'
annihilate = TRUE
/datum/map_template/om_ships/sdf_corvette_wreck
name = "OM Ship - SDF Corvette Wreck (new Z)"
desc = "A small SD patrol corvette. It seems to have had a bad day."
mappath = 'sdf_corvette_wreck.dmm'
annihilate = TRUE
/datum/map_template/om_ships/sdf_corvette
name = "OM Ship - SDF Cutter (new Z)"
desc = "A small SDF cutter, outfitted with an ORB/OFD."
mappath = 'sdf_cutter.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/sdf_corvette
name = "\improper SDF Corvette"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/sdf_corvette_wreck
name = "\improper SDF Corvette Wreck"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/sdf_cutter
name = "\improper SDF Cutter"
icon_state = "green"
requires_power = 1
has_gravity = 0
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/sdf_corvette
name = "short jump console"
shuttle_tag = "SDF Corvette"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/sdf_corvette_wreck
name = "short jump console"
shuttle_tag = "SDF Corvette Wreck"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/sdf_cutter
name = "short jump console"
shuttle_tag = "SDF Cutter"
req_one_access = list()
// The 'shuttle'
/datum/shuttle/autodock/overmap/sdf_corvette
name = "SDF Corvette"
current_location = "omship_spawn_sdf_corvette"
docking_controller_tag = "sdfc_dock_con"
shuttle_area = list(/area/shuttle/sdf_corvette)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/sdf_corvette_wreck
name = "SDF Corvette Wreck"
current_location = "omship_spawn_sdf_corvette_wreck"
docking_controller_tag = "sdfc_wreck_dock_con"
shuttle_area = list(/area/shuttle/sdf_corvette_wreck)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/sdf_cutter
name = "SDF Cutter"
current_location = "omship_spawn_sdf_cutter"
docking_controller_tag = "sdf_cutter_docking"
shuttle_area = list(/area/shuttle/sdf_corvette)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/sdf_corvette
name = "SDF Corvette"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_sdf_corvette"
shuttle_type = /datum/shuttle/autodock/overmap/sdf_corvette
/obj/effect/shuttle_landmark/shuttle_initializer/sdf_corvette_wreck
name = "SDF Corvette Wreck"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_sdf_corvette_wreck"
shuttle_type = /datum/shuttle/autodock/overmap/sdf_corvette_wreck
/obj/effect/shuttle_landmark/shuttle_initializer/sdf_cutter
name = "SDF Cutter"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_sdf_cutter"
shuttle_type = /datum/shuttle/autodock/overmap/sdf_cutter
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/sdf_corvette
name = "SDF Corvette"
scanner_desc = @{"[i]Registration[/i]: SDV Naginata
[i]Class[/i]: Corvette
[i]Transponder[/i]: Transmitting (SDF), non-hostile
[b]Notice[/b]: System Defense Force Vessel, observe minimum distance"}
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "SDF Corvette"
/obj/effect/overmap/visitable/ship/landable/sdf_corvette_wreck
name = "Wrecked SDF Corvette"
scanner_desc = @{"[i]Registration[/i]: SDV Bec de Corbin
[i]Class[/i]: Corvette
[i]Transponder[/i]: Not Transmitting
[b]Notice[/b]: Critical Damage Sustained"}
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "SDF Corvette Wreck"
/obj/effect/overmap/visitable/ship/landable/sdf_cutter
name = "SDF Cutter"
scanner_desc = @{"[i]Registration[/i]: SDV Pike
[i]Class[/i]: Cutter
[i]Transponder[/i]: Transmitting (SDF), non-hostile
[b]Notice[/b]: System Defense Force Vessel, observe minimum distance"}
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "SDF Cutter"
maps/offmap_vr/om_ships/sdf_cutter.dmm
+1143
View File
File diff suppressed because it is too large Load Diff
maps/offmap_vr/talon/talon_v2.dmm
+7 -9
View File
@@ -6926,7 +6926,6 @@
/area/talon_v2/crew_quarters/sec_room)
"vG" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
pixel_y = 32
},
/turf/simulated/floor/tiled/techfloor,
@@ -6984,6 +6983,9 @@
/obj/machinery/light/small{
dir = 1
},
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"vR" = (
@@ -11230,6 +11232,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/turf/simulated/floor/carpet,
/area/talon_v2/crew_quarters/mine_room)
"JL" = (
@@ -14428,13 +14433,6 @@
/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"TH" = (
/obj/structure/extinguisher_cabinet{
dir = 4;
pixel_x = -30
},
/turf/simulated/wall/shull,
/area/talon_v2/crew_quarters/mine_room)
"TJ" = (
/obj/machinery/mineral/stacking_unit_console{
pixel_y = -6;
@@ -27662,7 +27660,7 @@ It
jY
Ym
Um
TH
IB
Ax
Eu
yU
maps/submaps/pois_vr/debris_field/_templates.dm
+7
View File
@@ -285,3 +285,10 @@
cost = 45
allow_duplicates = FALSE
discard_prob = 50
/datum/map_template/debrisfield/blasted_sdf
name = "Blasted SDF Corvette"
mappath = 'maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm'
cost = 35
allow_duplicates = FALSE
discard_prob = 25
vorestation.dme
-2
View File
@@ -4190,8 +4190,6 @@
#include "maps\expedition_vr\beach\submaps\mountains.dm"
#include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
#include "maps\gateway_archive_vr\blackmarketpackers.dm"
#include "maps\offmap_vr\om_ships\abductor.dm"
#include "maps\offmap_vr\om_ships\lunaship.dm"
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
#include "maps\southern_cross\items\clothing\sc_under.dm"