cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6909 from Novacat/nova-shuttle

Browse Source 
Updates NT Cruiser
This commit is contained in:
Novacat
2020-03-19 18:56:19 -04:00
committed by GitHub
parent 4cd077019f 7ef6a91f0f
commit 31696e2873
7 changed files with 2449 additions and 1765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/portable_turret_vr.dm Normal file
View File

@@ -0,0 +1,12 @@
/obj/machinery/porta_turret/industrial/military
name = "military CIWS turret"
desc = "A ship-grade weapons turret designed for anti-fighter defense."
req_one_access = list(access_cent_general)
installation = /obj/item/weapon/gun/energy/lasercannon
health = 500
maxhealth = 500
enabled = TRUE
lethal = TRUE
check_weapons = TRUE
auto_repair = TRUE
can_salvage = FALSE

7
maps/tether/submaps/admin_use/cruiser.dm
View File

@@ -1,7 +0,0 @@
/obj/effect/overmap/visitable/ship/cruiser
name = "NT Cruiser"
desc = "A small cruiser pinging NT IFF."
color = "#00aaff" //Bluey
vessel_mass = 12000
vessel_size = SHIP_SIZE_LARGE
initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard")

124
maps/tether/submaps/om_ships/cruiser.dm
View File

@@ -3,15 +3,129 @@
#include "cruiser.dmm"
#endif
//////// Mothership areas ////////
/area/mothership
requires_power = 1
flags = RAD_SHIELDED
base_turf = /turf/space
icon_state = "blue-red2"
/area/mothership/breakroom
name = "Warship - Breakroom"
/area/mothership/hydroponics
name = "Warship - Hydroponics"
/area/mothership/kitchen
name = "Warship - Kitchen"
/area/mothership/eva
name = "Warship - EVA"
/area/mothership/bathroom1
name = "Warship - Bathroom 1"
/area/mothership/bathroom2
name = "Warship - Bathroom 2"
/area/mothership/dorm1
name = "Warship - Dorm 1"
/area/mothership/dorm2
name = "Warship - Dorm 2"
/area/mothership/dorm3
name = "Warship - Dorm 3"
/area/mothership/dorm4
name = "Warship - Dorm 4"
/area/mothership/dorm5
name = "Warship - Dorm 5"
/area/mothership/dorm6
name = "Warship - Dorm 6"
/area/mothership/chemistry
name = "Warship - Chemistry"
/area/mothership/surgery
name = "Warship - Surgery"
/area/mothership/vault
name = "Warship - Vault"
flags = RAD_SHIELDED | BLUE_SHIELDED
/area/mothership/teleporter
name = "Warship - Teleporter Room"
/area/mothership/security
name = "Warship - Security Equipment"
/area/mothership/treatment
name = "Warship - Treatment Center"
/area/mothership/medical
name = "Warship - Medical Equipment"
/area/mothership/resleeving
name = "Warship - Resleeving"
/area/mothership/morgue
name = "Warship - Morgue"
/area/mothership/rnd
name = "Warship - Research"
/area/mothership/robotics
name = "Warship - Robotics"
/area/mothership/sechallway
name = "Warship - Security Hallway"
/area/mothership/processing
name = "Warship - Processing"
/area/mothership/warden
name = "Warship - Warden"
/area/mothership/armory
name = "Warship - Armory"
flags = RAD_SHIELDED | BLUE_SHIELDED
/area/mothership/bridge
name = "Warship - Bridge"
/area/mothership/holodeck
name = "Warship - Holodeck Controls"
/area/mothership/holodeck/holo
name = "Warship - Holodeck"
icon_state = "dk_yellow"
/area/mothership/cryotube
name = "Warship - Cryo chamber"
/area/mothership/engineering
name = "Warship - Engineering"
/area/mothership/hallway
name = "Warship - Main Hallway"
/area/mothership/telecomms1
name = "Warship - Telecommunications Main"
/area/mothership/telecomms2
name = "Warship - Telecommunications Relay"
/datum/map_template/om_ships/cruiser
name = "OM Ship - NT Cruiser (New Z)"
name = "OM Ship - NDV Tabiranth (New Z)"
desc = "A large NT cruiser."
mappath = 'cruiser.dmm'
/obj/effect/overmap/visitable/ship/cruiser
name = "NT Cruiser"
desc = "A small cruiser pinging NT IFF."
name = "NDV Tabiranth"
desc = "A large military cruiser pinging NT IFF. An automated message warns unauthorized vessels from getting close."
color = "#00aaff" //Bluey
vessel_mass = 12000
vessel_mass = 15000
vessel_size = SHIP_SIZE_LARGE
initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "cruiser_port_dock", "cruiser_starboard_dock")
initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "ws_port_dock_1", "ws_port_dock_2", "ws_starboard_dock_1", "ws_starboard_dock_2")

2514
maps/tether/submaps/om_ships/cruiser.dmm
View File

File diff suppressed because it is too large Load Diff

1442
maps/tether/submaps/tether_misc.dmm
View File

File diff suppressed because it is too large Load Diff

114
maps/tether/tether_areas.dm
View File

@@ -1159,120 +1159,6 @@
/area/bigship/teleporter
name = "Bigship Teleporter Room"
//////// Mothership areas ////////
/area/mothership
requires_power = 1
flags = RAD_SHIELDED
base_turf = /turf/space
icon_state = "blue-red2"
/area/mothership/breakroom
name = "Warship - Breakroom"
/area/mothership/hydroponics
name = "Warship - Hydroponics"
/area/mothership/kitchen
name = "Warship - Kitchen"
/area/mothership/eva
name = "Warship - EVA"
/area/mothership/bathroom1
name = "Warship - Bathroom 1"
/area/mothership/bathroom2
name = "Warship - Bathroom 2"
/area/mothership/dorm1
name = "Warship - Dorm 1"
/area/mothership/dorm2
name = "Warship - Dorm 2"
/area/mothership/dorm3
name = "Warship - Dorm 3"
/area/mothership/dorm4
name = "Warship - Dorm 4"
/area/mothership/dorm5
name = "Warship - Dorm 5"
/area/mothership/dorm6
name = "Warship - Dorm 6"
/area/mothership/chemistry
name = "Warship - Chemistry"
/area/mothership/surgery
name = "Warship - Surgery"
/area/mothership/vault
name = "Warship - Vault"
flags = RAD_SHIELDED | BLUE_SHIELDED
/area/mothership/teleporter
name = "Warship - Teleporter Room"
/area/mothership/security
name = "Warship - Security Equipment"
/area/mothership/treatment
name = "Warship - Treatment Center"
/area/mothership/medical
name = "Warship - Medical Equipment"
/area/mothership/resleeving
name = "Warship - Resleeving"
/area/mothership/morgue
name = "Warship - Morgue"
/area/mothership/rnd
name = "Warship - Research"
/area/mothership/robotics
name = "Warship - Robotics"
/area/mothership/sechallway
name = "Warship - Security Hallway"
/area/mothership/processing
name = "Warship - Processing"
/area/mothership/warden
name = "Warship - Warden"
/area/mothership/armory
name = "Warship - Armory"
flags = RAD_SHIELDED | BLUE_SHIELDED
/area/mothership/bridge
name = "Warship - Bridge"
/area/mothership/holodeck
name = "Warship - Holodeck Controls"
/area/mothership/holodeck/holo
name = "Warship - Holodeck"
icon_state = "dk_yellow"
/area/mothership/cryotube
name = "Warship - Cryo chamber"
/area/mothership/engineering
name = "Warship - Engineering"
/area/mothership/hallway
name = "Warship - Main Hallway"
/area/mothership/telecomms1
name = "Warship - Telecommunications Main"
/area/mothership/telecomms2
name = "Warship - Telecommunications Relay"
//////// Abductor Areas ////////
/area/unknown
requires_power = 0

1
vorestation.dme
View File

@@ -781,6 +781,7 @@
#include "code\game\machinery\partslathe_vr.dm"
#include "code\game\machinery\pda_multicaster.dm"
#include "code\game\machinery\portable_turret.dm"
#include "code\game\machinery\portable_turret_vr.dm"
#include "code\game\machinery\recharger.dm"
#include "code\game\machinery\rechargestation.dm"
#include "code\game\machinery\requests_console.dm"