Merge pull request #8926 from KillianKirilenko/kk-ships

Additional Ships
This commit is contained in:
Novacat
2020-09-27 17:01:12 -04:00
committed by GitHub
18 changed files with 25126 additions and 1 deletions
+10
View File
@@ -0,0 +1,10 @@
/obj/random/empty_or_lootable_crate
name = "random crate"
desc = "Spawns a random crate which may or may not have contents. Sometimes spawns nothing."
icon = 'icons/obj/storage.dmi'
icon_state = "moneybag"
spawn_nothing_percentage = 20
/obj/random/empty_or_lootable_crate/item_to_spawn()
return pick(/obj/random/crate,
/obj/random/multiple/corp_crate)
+6 -1
View File
@@ -391,4 +391,9 @@
/obj/structure/symbol/sa
desc = "It looks like a right triangle with a dot to the side. It reminds you of a wooden strut between a wall and ceiling."
icon_state = "sa"
icon_state = "sa"
/obj/structure/symbol/maint
name = "maintenance panel"
desc = "This sign suggests that the wall it's attached to can be opened somehow."
icon_state = "maintenance_panel"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

+204
View File
@@ -0,0 +1,204 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "bearcat.dmm"
#endif
// -- Datums -- //
/datum/map_template/om_ships/bearcat
name = "OM Ship - Bearcat (New Z)"
desc = "An old salvage ship, abandoned but seemingly intact."
mappath = 'bearcat.dmm'
// The 'shuttle'
/datum/shuttle/autodock/overmap/bearcat
name = "Bearcat"
current_location = "omship_spawn_bearcat"
docking_controller_tag = "bearcat_docking"
shuttle_area = list( /area/ship/scrap,
/area/shuttle/bearcat/cargo,
/area/shuttle/bearcat/command,
/area/shuttle/bearcat/command_captain,
/area/shuttle/bearcat/comms,
/area/shuttle/bearcat/crew,
/area/shuttle/bearcat/crew_corridors,
/area/shuttle/bearcat/crew_dorms,
/area/shuttle/bearcat/crew_kitchen,
/area/shuttle/bearcat/crew_medbay,
/area/shuttle/bearcat/crew_saloon,
/area/shuttle/bearcat/crew_toilets,
/area/shuttle/bearcat/crew_wash,
/area/shuttle/bearcat/dock_central,
/area/shuttle/bearcat/dock_port,
/area/shuttle/bearcat/dock_starboard,
/area/shuttle/bearcat/maintenance,
/area/shuttle/bearcat/maintenance_atmos,
/area/shuttle/bearcat/maintenance_engine,
/area/shuttle/bearcat/maintenance_engine_pod_port,
/area/shuttle/bearcat/maintenance_engine_pod_starboard,
/area/shuttle/bearcat/maintenance_enginecontrol,
/area/shuttle/bearcat/maintenance_power,
/area/shuttle/bearcat/maintenance_storage,
/area/shuttle/bearcat/unused1,
/area/shuttle/bearcat/unused2
) //it's a miracle this thing works
defer_initialisation = TRUE //We're not loaded until an admin does it
fuel_consumption = 4 //chonker uses more fuel
move_direction = NORTH
ceiling_type = /turf/simulated/floor/reinforced/airless
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/bearcat
name = "IRV Bearcat"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_bearcat"
shuttle_type = /datum/shuttle/autodock/overmap/bearcat
/obj/effect/overmap/visitable/ship/landable/bearcat
scanner_name = "Binturong-class Salvage Vessel"
scanner_desc = @{"[i]Registration[/i]: IRV Bearcat
[i]Class:[/i] Corvette
[i]Transponder[/i]: Transmitting \'Keep-Away\' Signal
[b]Notice[/b]: Abandoned under unclear circumstances."}
known = FALSE
color = "#ee3333" //Reddish, so it looks kinda rusty and beat up
// initial_generic_waypoints = list("bearcat_dock_w", "bearcat_dock_e")
vessel_mass = 3500
vessel_size = SHIP_SIZE_LARGE
shuttle = "Bearcat"
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/bearcat
name = "short jump console"
shuttle_tag = "Bearcat"
req_one_access = list()
// -- Objs -- //
/obj/effect/shuttle_landmark/premade/bearcat/dock_w
name = "IRV Bearcat - Port Docking Ring"
landmark_tag = "bearcat_dock_w"
/obj/effect/shuttle_landmark/premade/bearcat/dock_e
name = "IRV Bearcat - Starboard Docking Ring"
landmark_tag = "bearcat_dock_e"
/area/ship/scrap
name = "\improper Bearcat"
has_gravity = 0 //predates artificial gravity - won't matter much due to all the walls to push off of!
/area/shuttle/bearcat/crew
name = "\improper Bearcat Crew Compartments"
icon_state = "hallC"
/area/shuttle/bearcat/crew_corridors
name = "\improper Bearcat Corridors"
icon_state = "hallC1"
/area/shuttle/bearcat/crew_kitchen
name = "\improper Bearcat Galley"
icon_state = "kitchen"
/area/shuttle/bearcat/crew_dorms
name = "\improper Bearcat Dorms"
icon_state = "crew_quarters"
/area/shuttle/bearcat/crew_saloon
name = "\improper Bearcat Saloon"
icon_state = "conference"
/area/shuttle/bearcat/crew_toilets
name = "\improper Bearcat Bathrooms"
icon_state = "toilet"
/area/shuttle/bearcat/crew_wash
name = "\improper Bearcat Washroom"
icon_state = "locker"
/area/shuttle/bearcat/crew_medbay
name = "\improper Bearcat Medical Bay"
icon_state = "medbay"
/area/shuttle/bearcat/cargo
name = "\improper Bearcat Cargo Hold"
icon_state = "quartstorage"
/area/shuttle/bearcat/dock
name = "\improper Bearcat Docking Bay"
icon_state = "start"
/area/shuttle/bearcat/dock_central
name = "\improper Bearcat Passenger Bay"
icon_state = "start"
/area/shuttle/bearcat/dock_port
name = "\improper Bearcat Docking Bay Port"
icon_state = "west"
/area/shuttle/bearcat/dock_starboard
name = "\improper Bearcat Docking Bay Starboard"
icon_state = "east"
/area/shuttle/bearcat/unused1
name = "\improper Bearcat Unused Compartment #1"
icon_state = "green"
/area/shuttle/bearcat/unused2
name = "\improper Bearcat Unused Compartment #2"
icon_state = "yellow"
/area/shuttle/bearcat/unused3
name = "\improper Bearcat Unused Compartment #3"
icon_state = "blueold"
/area/shuttle/bearcat/maintenance
name = "\improper Bearcat Maintenance Compartments"
icon_state = "storage"
/area/shuttle/bearcat/maintenance_storage
name = "\improper Bearcat Tools Storage"
icon_state = "eva"
/area/shuttle/bearcat/maintenance_atmos
name = "\improper Bearcat Atmospherics Compartment"
icon_state = "atmos"
music = list('sound/ambience/ambiatm1.ogg')
/area/shuttle/bearcat/maintenance_power
name = "\improper Bearcat Power Compartment"
icon_state = "engine_smes"
music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
/area/shuttle/bearcat/maintenance_engine
name = "\improper Bearcat Main Engine Compartment"
icon_state = "engine"
music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
/area/shuttle/bearcat/maintenance_engine_pod_port
name = "\improper Bearcat Port Engine Pod"
icon_state = "west"
music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
/area/shuttle/bearcat/maintenance_engine_pod_starboard
name = "\improper Bearcat Starboard Engine Pod"
icon_state = "east"
music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
/area/shuttle/bearcat/maintenance_enginecontrol
name = "\improper Bearcat Engine Control Room"
icon_state = "engine_monitoring"
music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
/area/shuttle/bearcat/command
name = "\improper Bearcat Command Deck"
icon_state = "centcom"
music = list('sound/ambience/signal.ogg')
/area/shuttle/bearcat/command_captain
name = "\improper Bearcat Captain's Quarters"
icon_state = "captain"
music = list('sound/ambience/signal.ogg')
/area/shuttle/bearcat/comms
name = "\improper Bearcat Communications Relay"
icon_state = "tcomsatcham"
music = list('sound/ambience/signal.ogg')
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+179
View File
@@ -0,0 +1,179 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "gecko_sh.dmm"
#include "gecko_cr.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/gecko_stationhopper
name = "OM Ship - Gecko Stationhopper (new Z)"
desc = "A medium personnel transport shuttle."
mappath = 'gecko_sh.dmm'
annihilate = TRUE
/datum/map_template/om_ships/gecko_cargohauler
name = "OM Ship - Gecko Cargo Hauler (new Z)"
desc = "A medium supply transport shuttle."
mappath = 'gecko_cr.dmm'
annihilate = TRUE
/datum/map_template/om_ships/gecko_cargohauler_wreck
name = "OM Ship - Wrecked Gecko Cargo Hauler (new Z)"
desc = "A wrecked medium supply transport shuttle."
mappath = 'gecko_cr_wreck.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/gecko_sh
name = "\improper Gecko Stationhopper"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_sh_engineering
name = "\improper Gecko Stationhopper Engineering"
icon_state = "yellow"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_sh_cockpit
name = "\improper Gecko Stationhopper Cockpit"
icon_state = "purple"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr
name = "\improper Gecko Cargo Hauler Bay"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr_engineering
name = "\improper Gecko Cargo Hauler Aft"
icon_state = "yellow"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr_cockpit
name = "\improper Gecko Cargo Hauler Fore"
icon_state = "purple"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr_wreck
name = "\improper Wrecked Gecko Cargo Hauler Bay"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr_engineering_wreck
name = "\improper Wrecked Gecko Cargo Hauler Aft"
icon_state = "yellow"
requires_power = 1
has_gravity = 0
/area/shuttle/gecko_cr_cockpit_wreck
name = "\improper Wrecked Gecko Cargo Hauler Fore"
icon_state = "purple"
requires_power = 1
has_gravity = 0
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/gecko_sh
name = "short jump console"
shuttle_tag = "Gecko Stationhopper"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/gecko_cr
name = "short jump console"
shuttle_tag = "Gecko Cargo Hauler"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/gecko_cr_wreck
name = "short jump console"
shuttle_tag = "Wrecked Gecko Cargo Hauler"
req_one_access = list()
// The 'shuttle'
/datum/shuttle/autodock/overmap/gecko_sh
name = "Gecko Stationhopper"
current_location = "omship_spawn_gecko_sh"
docking_controller_tag = "geck_sh_docking"
shuttle_area = list(/area/shuttle/gecko_sh,/area/shuttle/gecko_sh_cockpit,/area/shuttle/gecko_sh_engineering)
defer_initialisation = TRUE //We're not loaded until an admin does it
fuel_consumption = 7.5
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/gecko_cr
name = "Gecko Cargo Hauler"
current_location = "omship_spawn_gecko_cr"
docking_controller_tag = "geck_cr_docking"
shuttle_area = list(/area/shuttle/gecko_cr,/area/shuttle/gecko_cr_cockpit,/area/shuttle/gecko_cr_engineering)
defer_initialisation = TRUE //We're not loaded until an admin does it
fuel_consumption = 7.5
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/gecko_cr_wreck
name = "Wrecked Gecko Cargo Hauler"
current_location = "omship_spawn_gecko_cr_wreck"
docking_controller_tag = "geck_cr_wreck_docking"
shuttle_area = list(/area/shuttle/gecko_cr_wreck,/area/shuttle/gecko_cr_cockpit_wreck,/area/shuttle/gecko_cr_engineering_wreck)
defer_initialisation = TRUE //We're not loaded until an admin does it
fuel_consumption = 7.5
ceiling_type = /turf/simulated/floor/reinforced/airless
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/gecko_sh
name = "ITV Gecko I"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_gecko_sh"
shuttle_type = /datum/shuttle/autodock/overmap/gecko_sh
/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr
name = "ITV Gecko II"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_gecko_cr"
shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr
/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr_wreck
name = "ITV Gecko III"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_gecko_cr_wreck"
shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr_wreck
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/gecko_sh
scanner_name = "Gecko-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Sticky Fingers
[i]Class[/i]: Medium Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Medium personnel transport vessel"}
color = "#3366FF"
vessel_mass = 6500
vessel_size = SHIP_SIZE_LARGE
shuttle = "Gecko Stationhopper"
/obj/effect/overmap/visitable/ship/landable/gecko_cr
scanner_name = "Gecko-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Sticky Business
[i]Class[/i]: Medium Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Medium cargo transport vessel"}
color = "#3366FF"
vessel_mass = 6500
vessel_size = SHIP_SIZE_LARGE
shuttle = "Gecko Cargo Hauler"
/obj/effect/overmap/visitable/ship/landable/gecko_cr_wreck
scanner_name = "Wrecked Gecko-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Sticky Situation
[i]Class[/i]: Medium Shuttle
[i]Transponder[/i]: Weakly transmitting (CIV), non-hostile
[b]Notice[/b]: Medium cargo transport vessel, significant damage inflicted"}
color = "#3366FF"
vessel_mass = 6500
vessel_size = SHIP_SIZE_LARGE
shuttle = "Wrecked Gecko Cargo Hauler"
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+246
View File
@@ -0,0 +1,246 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "mackerel_sh.dmm"
#include "mackerel_lc.dmm"
#include "mackerel_lc_wreck.dmm"
#include "mackerel_hc.dmm"
#include "mackerel_hc_skel.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/mackerel_stationhopper
name = "OM Ship - Mackerel Stationhopper (new Z)"
desc = "A small personnel transport shuttle."
mappath = 'mackerel_sh.dmm'
annihilate = TRUE
/datum/map_template/om_ships/mackerel_lightcargo
name = "OM Ship - Mackerel Light Cargo (new Z)"
desc = "A small light cargo transport shuttle."
mappath = 'mackerel_lc.dmm'
annihilate = TRUE
/datum/map_template/om_ships/mackerel_heavycargo
name = "OM Ship - Mackerel Heavy Cargo (new Z)"
desc = "A small secure cargo transport shuttle."
mappath = 'mackerel_hc.dmm'
annihilate = TRUE
/datum/map_template/om_ships/mackerel_heavycargo_skel
name = "OM Ship - Mackerel Heavy Cargo Spartanized (new Z)"
desc = "A small heavy cargo transport shuttle."
mappath = 'mackerel_hc_skel.dmm'
annihilate = TRUE
/datum/map_template/om_ships/mackerel_lightcargo_wreck
name = "OM Ship - Mackerel Light Cargo Wreck (new Z)"
desc = "A small light cargo transport shuttle, struck by... something. Ouch."
mappath = 'mackerel_lc_wreck.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/mackerel_sh
name = "\improper Mackerel Stationhopper"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_lc
name = "\improper Mackerel Light Cargo"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_hc
name = "\improper Mackerel Heavy Cargo"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_hc_skel
name = "\improper Mackerel Heavy Cargo Spartan"
icon_state = "green"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_hc_skel_cockpit
name = "\improper Mackerel Heavy Cargo Cockpit"
icon_state = "purple"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_hc_skel_eng
name = "\improper Mackerel Heavy Cargo Engineering"
icon_state = "yellow"
requires_power = 1
has_gravity = 0
/area/shuttle/mackerel_lc_wreck
name = "\improper Wrecked Mackerel Light Cargo"
icon_state = "green"
requires_power = 1
has_gravity = 0
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/mackerel_sh
name = "short jump console"
shuttle_tag = "Mackerel Stationhopper"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/mackerel_lc
name = "short jump console"
shuttle_tag = "Mackerel Light Cargo"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/mackerel_lc_wreck
name = "short jump console"
shuttle_tag = "Mackerel Light Cargo II"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/mackerel_hc
name = "short jump console"
shuttle_tag = "Mackerel Heavy Cargo"
req_one_access = list()
/obj/machinery/computer/shuttle_control/explore/mackerel_hc_skel
name = "short jump console"
shuttle_tag = "Mackerel Heavy Cargo Spartan"
req_one_access = list()
// The 'shuttle'
/datum/shuttle/autodock/overmap/mackerel_sh
name = "Mackerel Stationhopper"
current_location = "omship_spawn_mackerel_sh"
docking_controller_tag = "mackerel_sh_docking"
shuttle_area = list(/area/shuttle/mackerel_sh)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/mackerel_lc
name = "Mackerel Light Cargo"
current_location = "omship_spawn_mackerel_lc"
docking_controller_tag = "mackerel_lc_docking"
shuttle_area = list(/area/shuttle/mackerel_lc)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/mackerel_hc
name = "Mackerel Heavy Cargo"
current_location = "omship_spawn_mackerel_hc"
docking_controller_tag = "mackerel_hc_docking"
shuttle_area = list(/area/shuttle/mackerel_hc)
defer_initialisation = TRUE
fuel_consumption = 1.25 //slightly higher due to the added framework/plating
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/mackerel_hc_skel
name = "Mackerel Heavy Cargo Spartan"
current_location = "omship_spawn_mackerel_hc_skel"
docking_controller_tag = "mackerel_hc_skel_docking"
shuttle_area = list(/area/shuttle/mackerel_hc_skel,/area/shuttle/mackerel_hc_skel_cockpit,/area/shuttle/mackerel_hc_skel_eng)
defer_initialisation = TRUE
fuel_consumption = 1.20 //slightly lower due to the stripped-down internals
ceiling_type = /turf/simulated/floor/reinforced/airless
/datum/shuttle/autodock/overmap/mackerel_lc_wreck
name = "Mackerel Light Cargo II"
current_location = "omship_spawn_mackerel_lc_wreck"
docking_controller_tag = "mackerel_lc_wreck_docking"
shuttle_area = list(/area/shuttle/mackerel_lc_wreck)
defer_initialisation = TRUE
fuel_consumption = 1
ceiling_type = /turf/simulated/floor/reinforced/airless
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_sh
name = "ITV Mackerel I"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_mackerel_sh"
shuttle_type = /datum/shuttle/autodock/overmap/mackerel_sh
/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc
name = "ITV Mackerel II"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_mackerel_lc"
shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc
/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc
name = "ITV Mackerel III"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_mackerel_hc"
shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc
/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc_skel
name = "ITV Mackerel IV"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_mackerel_hc_skel"
shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc_skel
/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc_wreck
name = "ITV Mackerel II KIA"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_mackerel_lc_wreck"
shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc_wreck
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/mackerel_sh
scanner_name = "Mackerel-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Phish Phlake
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
color = "#3366FF"
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "Mackerel Stationhopper"
/obj/effect/overmap/visitable/ship/landable/mackerel_lc
scanner_name = "Mackerel-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Phishy Business
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
color = "#0099FF"
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "Mackerel Light Cargo"
/obj/effect/overmap/visitable/ship/landable/mackerel_hc
scanner_name = "Mackerel-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Phish Pharma
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
color = "#33CCCC"
vessel_mass = 1500
vessel_size = SHIP_SIZE_TINY
shuttle = "Mackerel Heavy Cargo"
/obj/effect/overmap/visitable/ship/landable/mackerel_hc_skel
scanner_name = "Mackerel-class Transport (Spartanized)"
scanner_desc = @{"[i]Registration[/i]: ITV Phish Pond
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
color = "#33CCCC"
vessel_mass = 1500
vessel_size = SHIP_SIZE_TINY
shuttle = "Mackerel Heavy Cargo Spartan"
/obj/effect/overmap/visitable/ship/landable/mackerel_lc_wreck
scanner_name = "Wrecked Mackerel-class Transport"
scanner_desc = @{"[i]Registration[/i]: ITV Phish Phood
[i]Class[/i]: Small Shuttle Wreck
[i]Transponder[/i]: Not Transmitting
[b]Notice[/b]: Critical Damage Sustained"}
color = "#0099FF"
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "Mackerel Light Cargo II"
@@ -104,3 +104,17 @@
cost = 35
allow_duplicates = FALSE
discard_prob = 50
/datum/map_template/debrisfield/gutted_mackerel
name = "Gutted Mackerel LC"
mappath = 'maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm'
cost = 35
allow_duplicates = FALSE
discard_prob = 25
/datum/map_template/debrisfield/ruined_gecko
name = "Ruined Gecko CR"
mappath = 'maps/offmap_vr/om_ships/gecko_cr_wreck.dmm'
cost = 45
allow_duplicates = FALSE
discard_prob = 50
+3
View File
@@ -514,9 +514,12 @@
#include "../../offmap_vr/om_ships/screebarge.dm"
#include "../../offmap_vr/om_ships/aro.dm"
#include "../../offmap_vr/om_ships/aro2.dm"
#include "../../offmap_vr/om_ships/bearcat.dm"
#include "../../offmap_vr/om_ships/cruiser.dm"
#include "../../offmap_vr/om_ships/vespa.dm"
#include "../../offmap_vr/om_ships/generic_shuttle.dm"
#include "../../offmap_vr/om_ships/geckos.dm"
#include "../../offmap_vr/om_ships/mackerels.dm"
#include "../../offmap_vr/om_ships/mercenarybase.dm"
#include "../../offmap_vr/om_ships/mercship.dm"
#include "../../offmap_vr/om_ships/curashuttle.dm"
+1
View File
@@ -1363,6 +1363,7 @@
#include "code\game\objects\random\guns_and_ammo.dm"
#include "code\game\objects\random\maintenance.dm"
#include "code\game\objects\random\mapping.dm"
#include "code\game\objects\random\mapping_vr.dm"
#include "code\game\objects\random\mechs.dm"
#include "code\game\objects\random\misc.dm"
#include "code\game\objects\random\misc_vr.dm"