mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
Reverts Shipstation (#5414)
This commit is contained in:
BluBerry016
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
||||
{
|
||||
"version": 1,
|
||||
"map_name": "ShipStation",
|
||||
"map_path": "map_files/ShipStation",
|
||||
"map_file": "ShipStation.dmm",
|
||||
"shuttles": {
|
||||
"emergency": "emergency_delta",
|
||||
"ferry": "ferry_fancy",
|
||||
"cargo": "cargo_delta",
|
||||
"whiteship": "whiteship_delta"
|
||||
},
|
||||
"job_changes": {
|
||||
"shuttlepilot": {
|
||||
"total_positions": 1,
|
||||
"spawn_positions": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -64,10 +64,7 @@
|
||||
return COMPONENT_BLOCK_MARK_RETRIEVAL
|
||||
|
||||
/datum/component/stationloving/proc/in_bounds()
|
||||
//SKYRAT EDIT CHANGE BEGIN - Mapping
|
||||
//var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4)) - SKYRAT EDIT - ORIGINAL
|
||||
var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4, /area/shuttle/shipstation))
|
||||
//SKYRAT EDIT CHANGE END
|
||||
var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
|
||||
var/static/list/disallowed_centcom_areas = typecacheof(list(/area/abductor_ship, /area/awaymission/errorroom))
|
||||
var/turf/T = get_turf(parent)
|
||||
if (!T)
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
dwidth = 11
|
||||
height = 22
|
||||
width = 35
|
||||
shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_ship", "whiteship_tram", "whiteship_outpost") //SKYRAT EDIT - Mapping - Adds shipstation and outpost's whiteship, along with tram's. Update with more as added!
|
||||
shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta")
|
||||
|
||||
/obj/docking_port/mobile
|
||||
name = "shuttle"
|
||||
|
||||
@@ -47,12 +47,6 @@ endmap
|
||||
|
||||
##SKYRAT MAPS##
|
||||
|
||||
map shipstation
|
||||
minplayers 0
|
||||
maxplayers 39
|
||||
votable
|
||||
endmap
|
||||
|
||||
map nssjourney
|
||||
minplayers 25
|
||||
votable
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
/datum/map_template/shuttle/shipstation
|
||||
port_id = "station"
|
||||
who_can_purchase = null
|
||||
suffix = "ship"
|
||||
name = "NTSS 'Companionship'"
|
||||
|
||||
/datum/map_template/shuttle/whiteship/ship
|
||||
suffix = "ship"
|
||||
name = "NTSS 'Friendship'"
|
||||
|
||||
/datum/map_template/shuttle/arrival/outpost
|
||||
suffix = "outpost"
|
||||
name = "arrival shuttle (Outpost)"
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
/area/shuttle/shipstation
|
||||
name = "NTSS 'Companionship'"
|
||||
requires_power = TRUE
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/traitor/bros/New()
|
||||
restricted_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/changeling/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/traitor/changeling/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/cult/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/devil/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/monkey/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/revolution/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/datum/game_mode/traitor/New()
|
||||
protected_jobs += "Shuttle Pilot"
|
||||
. = ..()
|
||||
@@ -1,3 +0,0 @@
|
||||
/obj/effect/landmark/start/shuttlepilot
|
||||
name = "Shuttle Pilot"
|
||||
icon_state = "Security Officer"
|
||||
@@ -1,55 +0,0 @@
|
||||
/datum/job/shuttlepilot
|
||||
title = "Shuttle Pilot"
|
||||
auto_deadmin_role_flags = DEADMIN_POSITION_HEAD
|
||||
department_head = list("CentCom")
|
||||
faction = "Station"
|
||||
total_positions = 0 //Set to 1 in map config if your map has a dedicated station-shuttle, see shipstation for an example.
|
||||
spawn_positions = 0 //Ditto.
|
||||
supervisors = "The Captain, and the people you leave behind"
|
||||
selection_color = "#ccccff"
|
||||
req_admin_notify = 1
|
||||
minimal_player_age = 14
|
||||
exp_requirements = 180
|
||||
exp_type = EXP_TYPE_CREW
|
||||
exp_type_department = EXP_TYPE_COMMAND
|
||||
|
||||
outfit = /datum/outfit/job/shuttlepilot
|
||||
|
||||
paycheck = PAYCHECK_COMMAND
|
||||
paycheck_department = ACCOUNT_SEC
|
||||
|
||||
display_order = JOB_DISPLAY_ORDER_CAPTAIN
|
||||
|
||||
/datum/job/shuttlepilot/announce(mob/living/carbon/human/H)
|
||||
..()
|
||||
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Shuttle Pilot [H.real_name] on deck!"))
|
||||
|
||||
/datum/outfit/job/shuttlepilot //Controls the ship, the real captain stays at the dock and keeps the nuke diskie. Technically a captain in their own right, but still answers to the station captain. Think of them as the QM to the captain's HOP.
|
||||
name = "Shuttle Pilot"
|
||||
jobtype = /datum/job/shuttlepilot
|
||||
|
||||
id = /obj/item/card/id/advanced/silver
|
||||
belt = /obj/item/pda/captain
|
||||
glasses = /obj/item/clothing/glasses/sunglasses
|
||||
ears = /obj/item/radio/headset/heads/captain/alt
|
||||
gloves = /obj/item/clothing/gloves/color/captain/pilot
|
||||
uniform = /obj/item/clothing/under/rank/captain/pilot
|
||||
shoes = /obj/item/clothing/shoes/sneakers/brown
|
||||
head = /obj/item/clothing/head/caphat/pilot
|
||||
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
|
||||
|
||||
backpack = /obj/item/storage/backpack/captain
|
||||
satchel = /obj/item/storage/backpack/satchel/cap
|
||||
duffelbag = /obj/item/storage/backpack/duffelbag/captain
|
||||
|
||||
implants = list(/obj/item/implant/mindshield)
|
||||
|
||||
id_trim = /datum/id_trim/job/captain/shuttle_pilot
|
||||
|
||||
/datum/outfit/plasmaman/shuttlepilot
|
||||
name = "Shuttle Pilot Plasmaman"
|
||||
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/captain
|
||||
uniform = /obj/item/clothing/under/plasmaman/captain
|
||||
gloves = /obj/item/clothing/gloves/color/captain/pilot
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/obj/machinery/computer/shuttle/shipstation
|
||||
name = "NTSS 'Companionship' Shuttle Console"
|
||||
desc = "Used to control the NTSS 'Companionship'."
|
||||
shuttleId = "station"
|
||||
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;station_custom"
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/shipstation
|
||||
name = "NTSS 'Companionship' Navigation Computer"
|
||||
desc = "Used to designate a precise transit location for the NTSS 'Companionship'."
|
||||
shuttleId = "station"
|
||||
lock_override = NONE
|
||||
shuttlePortId = "station_custom"
|
||||
jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "whiteship_lavaland" = 1)
|
||||
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral)
|
||||
view_range = 12
|
||||
designate_time = 50
|
||||
x_offset = 9
|
||||
y_offset = 9
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
@@ -4098,26 +4098,14 @@
|
||||
#include "modular_skyrat\modules\mapping\code\datums\ruins\icemoon.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\datums\ruins\lavaland.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\datums\ruins\space.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\area\areas\shuttles.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\area\areas\ruins\space.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\brother\traitor_bro.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\changeling\changeling.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\changeling\traitor_chan.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\cult\cult.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\devil\devil_game_mode.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\monkey\monkey.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\revolution\revolution.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\gamemodes\traitor\traitor.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\objects\effects\landmarks.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\objects\effects\decals\vgdecals.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\game\objects\structures\ghost_role_spawners.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\clothing\gloves\color.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\clothing\head\jobs.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\clothing\under\jobs\command.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\jobs\job_types\shuttle_pilot.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\modular_computers\computers\item\laptop_presets.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\ruins\lavaland_ruin_code.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\shuttle\shipstation.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\modules\vending\wardrobes.dm"
|
||||
#include "modular_skyrat\modules\medical\code\bodypart.dm"
|
||||
#include "modular_skyrat\modules\medical\code\bodypart_aid.dm"
|
||||
|
||||
Reference in New Issue
Block a user