New outsider alt title: Space Farer (outsider shuttles) (#8775)

Co-authored-by: Guti <guti23400@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
tacoguy7765093
2024-08-28 09:11:08 -05:00
committed by GitHub
parent d34215950a
commit 2457aefda9
11 changed files with 4405 additions and 14 deletions

View File

@@ -20,6 +20,16 @@
wallet.owner_name = H.real_name
wallet.worth = 1000
/decl/hierarchy/outfit/noncrew/spacefarer
name = OUTFIT_JOB_NAME("Spacefarer")
uniform = /obj/item/clothing/under/rank/pilot2
shoes = /obj/item/clothing/shoes/boots/jackboots/
r_pocket = /obj/item/weapon/spacecash/ewallet
l_pocket = /obj/item/device/survivalcapsule/superpose/shuttle
l_hand = /obj/item/weapon/tank/jetpack/oxygen //OUTFIT_HAS_JETPACK doesnt seem to work.
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/shadekin
name = OUTFIT_JOB_NAME(JOB_ANOMALY)
//hierarchy_type = /decl/hierarchy/outfit/noncrew

View File

@@ -1,20 +1,20 @@
/datum/job/noncrew
title = JOB_OUTSIDER
disallow_jobhop = TRUE
total_positions = 6
spawn_positions = 6
supervisors = "nobody, but you fall under NanoTrasen's Unauthorized Personnel SOP while on NT property. Please read <a href='https://wiki.chompstation13.net/index.php/Rules#Outsiders_Guidelines'>the Outsider Guidelines</a> clearly before playing"
title = JOB_OUTSIDER
disallow_jobhop = TRUE
total_positions = 6
spawn_positions = 6
supervisors = "nobody, but you fall under NanoTrasen's Unauthorized Personnel SOP while on NT property. Please read <a href='https://wiki.chompstation13.net/index.php/Rules#Outsiders_Guidelines'>the Outsider Guidelines</a> clearly before playing"
flag = NONCREW
departments = list(DEPARTMENT_NONCREW)
department_flag = OTHER
faction = "Station"
assignable = FALSE
account_allowed = 0
offmap_spawn = TRUE
flag = NONCREW
departments = list(DEPARTMENT_NONCREW)
department_flag = OTHER
faction = "Station"
assignable = FALSE
account_allowed = 0
offmap_spawn = TRUE
outfit_type = /decl/hierarchy/outfit/noncrew
job_description = {"Players taking a role of an outsider not employed by NT with no special mechanics. One superpose pod is provided.
outfit_type = /decl/hierarchy/outfit/noncrew
job_description = {"Players taking a role of an outsider not employed by NT with no special mechanics. One superpose pod is provided.
-----Server rules still apply to the fullest
-----Outsiders are considered unauthorized personnel on Southern Cross.
-----Outsiders are not allowed to take part in events and mini-event areas unless the EM says otherwise.
@@ -24,6 +24,11 @@
-----Outsiders are not allowed to log-off with station key items (e.g. Captain's spare, station blueprints, nuclear authentication disk, bluespace harpoon, large quantities of station goods, etc). Please leave these items on station or with relevant crew.
-----We encourage outsiders to take on exploration content as a group, staff will not help you for any hardships of solo play.
-----Notice: The outsider role is relatively new; if you encounter bugs, please notify a staff member and avoid using exploits."}
alt_titles = list("Spacefarer" = /datum/alt_title/spacefarer)
/datum/alt_title/spacefarer
title = "Spacefarer"
title_outfit = /decl/hierarchy/outfit/noncrew/spacefarer
/*seems to be a kin only thing?
/datum/job/noncrew/is_species_banned(species_name, brain_type)

View File

@@ -187,3 +187,32 @@
template = null // Important to reset both, otherwise the template cannot be reset once the pod has been deployed.
to_chat(user, "<span class='notice'>You reset the pod's selection.</span>")
..()
/obj/item/device/survivalcapsule/superpose/shuttle
name = "superposed surfluid shuttle capsule"
is_ship = TRUE //So you cant just make holes in planets
/obj/item/device/survivalcapsule/superpose/shuttle/attack_self()
if(!pod_initialized)
for(var/datum/map_template/shelter/superpose/shelter_type as anything in subtypesof(/datum/map_template/shelter/))
if(!(initial(shelter_type.mappath)) || !(initial(shelter_type.shuttle)))
continue
template_ids += initial(shelter_type.shelter_id)
pod_initialized = TRUE
if(!template_id)
var/answer = tgui_input_list(usr, "Which template would you like to load?","Available Templates", template_ids)
if(!answer)
return
else
template_id = answer
unique_id = answer
return
..()
/obj/item/device/survivalcapsule/superpose/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/pen) && !used)
template_id = null
unique_id = null
template = null
to_chat(user, SPAN_NOTICE("You reset the pod's selection."))
..()

View File

@@ -1,5 +1,6 @@
/datum/map_template/shelter
var/superpose = FALSE
var/shuttle = FALSE
// Subtype to mark maps for use with the superpose capsule. This is mostly to prevent automatic additions from upstream changes.
/datum/map_template/shelter/superpose

View File

@@ -0,0 +1,380 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"c" = (
/obj/machinery/computer/ship/helm{
req_one_access = newlist()
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"d" = (
/obj/structure/table/survival_pod,
/obj/fruitspawner/watermelon,
/obj/item/device/gps/explorer,
/obj/item/device/gps/explorer,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"e" = (
/obj/machinery/door/airlock/glass_external{
safe = 0
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
dir = 6;
pixel_y = 25
},
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/plating,
/area/shuttle/cybershuttle)
"g" = (
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"h" = (
/obj/machinery/computer/ship/engines{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"j" = (
/obj/machinery/ion_engine{
dir = 1
},
/obj/structure/window/plastitanium{
dir = 8
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/cybershuttle)
"k" = (
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/tank/air/full{
start_pressure = 10000
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"l" = (
/turf/simulated/wall/rthull,
/area/shuttle/cybershuttle)
"m" = (
/obj/machinery/power/terminal{
dir = 2
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"o" = (
/obj/structure/window/plastitanium,
/obj/machinery/power/smes/buildable/point_of_interest,
/obj/structure/cable/blue{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/shuttle/cybershuttle)
"q" = (
/obj/machinery/computer/shuttle_control/explore/cybershuttle,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"r" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"t" = (
/obj/structure/window/plastitanium{
dir = 4
},
/obj/structure/window/plastitanium{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"w" = (
/obj/machinery/door/airlock/glass_external{
safe = 0
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/airlock_sensor{
pixel_x = -11;
pixel_y = -23;
dir = 4
},
/obj/effect/map_helper/airlock/sensor/int_sensor,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"y" = (
/obj/structure/hull_corner{
dir = 8
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/cybershuttle)
"z" = (
/obj/structure/window/plastitanium,
/obj/machinery/power/terminal{
dir = 4
},
/obj/structure/cable/blue{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/alarms_hidden{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/plating,
/area/shuttle/cybershuttle)
"D" = (
/obj/structure/window/plastitanium/full,
/obj/structure/grille/rustic{
health = 25;
name = "reinforced grille"
},
/turf/simulated/floor/plating,
/area/shuttle/cybershuttle)
"E" = (
/obj/machinery/computer/ship/sensors{
dir = 2
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"F" = (
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"G" = (
/obj/structure/hull_corner,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/cybershuttle)
"J" = (
/obj/structure/bed/chair/bay/comfy/black{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"P" = (
/obj/machinery/ion_engine{
dir = 1
},
/obj/structure/window/plastitanium{
dir = 4
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/cybershuttle)
"Q" = (
/obj/machinery/ion_engine{
dir = 1
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/cybershuttle)
"R" = (
/obj/effect/shuttle_landmark/shuttle_initializer/cybershuttle,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "cybershuttle_docker";
pixel_y = 28;
pixel_x = -5
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/airlock_sensor{
pixel_y = 27;
pixel_x = 7
},
/obj/effect/overmap/visitable/ship/landable/cybershuttle,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"S" = (
/obj/structure/window/plastitanium{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/cybershuttle)
"T" = (
/obj/machinery/shipsensors/weak{
dir = 1
},
/turf/simulated/floor/plating/external,
/area/shuttle/cybershuttle)
"V" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/wall/rthull,
/area/shuttle/cybershuttle)
"W" = (
/obj/machinery/door/airlock/voidcraft/vertical{
icon_state = "door_locked";
locked = 1;
name = "shuttle side hatch";
id_tag = "cybershuttle_hatch"
},
/obj/machinery/button/remote/airlock{
desiredstate = 1;
dir = 4;
id = "cybershuttle_hatch";
name = "Side Hatch Control";
specialfunctions = 4;
pixel_y = 26
},
/turf/simulated/floor/plating,
/area/shuttle/cybershuttle)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
T
l
j
a
"}
(3,1,1) = {"
a
G
l
D
D
l
W
l
l
Q
a
"}
(4,1,1) = {"
a
D
c
J
g
F
g
h
l
l
a
"}
(5,1,1) = {"
a
D
q
g
g
g
g
m
o
Q
a
"}
(6,1,1) = {"
a
D
E
J
g
S
t
r
z
Q
a
"}
(7,1,1) = {"
a
D
d
g
k
V
R
w
l
l
a
"}
(8,1,1) = {"
a
y
l
D
D
l
e
l
l
Q
a
"}
(9,1,1) = {"
a
a
a
a
a
a
a
y
l
P
a
"}
(10,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
"}

View File

@@ -0,0 +1,59 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "cybershuttle-10x11.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/cybershuttle
name = "OM Ship - Cyber Shuttle"
desc = "A small privately-owned vessel with some snobbiness to it."
mappath = 'cybershuttle-10x11.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/cybershuttle
name = "\improper Cyber Shuttle"
icon_state = "shuttle2"
requires_power = 1
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/cybershuttle
name = "short jump console"
shuttle_tag = "Cyber Shuttle" //These names must match
req_one_access = null
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/cybershuttle
name = "Cyber Shuttle"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_cybershuttle"
shuttle_type = /datum/shuttle/autodock/overmap/cybershuttle
// The 'shuttle'
/datum/shuttle/autodock/overmap/cybershuttle
name = "Cyber Shuttle" //These names must match
current_location = "omship_spawn_cybershuttle"
docking_controller_tag = "cybershuttle_docker" //This is the only thing you map in and var edit, use the map helpers to designate doors and pumps
shuttle_area = list(/area/shuttle/cybershuttle)
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/cybershuttle
name = "Cyber Shuttle" //These names must match
scanner_desc = @{"[i]Registration[/i]: PRIVATE
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
vessel_mass = 500 //YEETus, like the real thing!
burn_delay = 0.25 SECONDS //Fast as fuck
vessel_size = SHIP_SIZE_TINY
shuttle = "Cyber Shuttle" //These names must match
/datum/map_template/shelter/superpose/cybershuttle
shelter_id = "CyberShuttle"
mappath = 'cybershuttle-10x11.dmm'
name = "CyberShuttle"
description = "A very fast, very snobby very dangerous deathtrap that make you look rich."
superpose = FALSE
shuttle = TRUE

View File

@@ -11,3 +11,5 @@
#include "shelter_5.dm"
#include "shelter_6.dm"
#include "cruiser.dm"
#include "pizzashuttle.dm"
#include "cybershuttle.dm"

View File

@@ -0,0 +1,702 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/table/steel_reinforced,
/obj/item/weapon/paper_bin,
/obj/item/weapon/pen/red,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"c" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 2;
health = 1e+006;
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
dir = 1
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"d" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"e" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 8;
health = 1e+006;
pixel_y = 0
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"f" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = null;
locked = 0
},
/turf/simulated/floor/tiled/white,
/area/shuttle/pizza_shuttle)
"g" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 2;
health = 1e+006;
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"h" = (
/obj/machinery/appliance/cooker/oven,
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"i" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/computer/shuttle_control/explore/pizza_shuttle{
dir = 2
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"j" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"k" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
},
/turf/simulated/wall/shull,
/area/shuttle/pizza_shuttle)
"l" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"m" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/closet/crate/bin{
anchored = 1
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"n" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"o" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/machinery/airlock_sensor{
pixel_y = 28;
pixel_x = -4
},
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "pizza_shuttle_docker";
pixel_y = 28;
pixel_x = 7
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"p" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "expshuttle_vent"
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/shuttle_landmark/shuttle_initializer/pizza_shuttle,
/obj/effect/overmap/visitable/ship/landable/pizza_shuttle,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"q" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"r" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10
},
/turf/simulated/wall/shull,
/area/shuttle/pizza_shuttle)
"s" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/table/steel_reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Pizza Gut";
req_one_access = newlist()
},
/obj/item/toy/plushie/borgplushie/medihound{
pixel_y = 8;
pixel_x = 8
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"t" = (
/obj/machinery/shipsensors/weak,
/turf/simulated/floor/plating/external,
/area/shuttle/pizza_shuttle)
"u" = (
/obj/structure/window/basic{
dir = 4
},
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"v" = (
/obj/machinery/atmospherics/unary/engine{
dir = 1
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/pizza_shuttle)
"w" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/table/marble,
/obj/item/weapon/book/codex/chef_recipes,
/obj/item/clothing/head/soft/red,
/obj/item/clothing/head/soft/red,
/obj/structure/window/basic{
dir = 4
},
/obj/item/clothing/head/pizzaguy,
/obj/item/clothing/head/pizzaguy,
/obj/item/clothing/under/pizzaguy,
/obj/item/clothing/under/pizzaguy,
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"x" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/power/smes/buildable/point_of_interest,
/obj/structure/cable/blue{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"y" = (
/obj/machinery/atmospherics/portables_connector,
/obj/machinery/portable_atmospherics/canister/phoron,
/obj/effect/floor_decal/corner/yellow/diagonal,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"z" = (
/obj/machinery/appliance/cooker/fryer,
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"A" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/media/jukebox{
pixel_y = -32;
density = 0
},
/obj/machinery/light,
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"B" = (
/obj/machinery/door/airlock/glass_external,
/obj/effect/map_helper/airlock/door/ext_door,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/airlock_sensor/airlock_exterior/shuttle{
dir = 6;
pixel_x = -7;
pixel_y = -24
},
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"C" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/bed/chair/bay/chair/padded/red{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"F" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"G" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/table/marble,
/obj/item/weapon/material/kitchen/rollingpin,
/obj/item/weapon/material/knife/butch,
/obj/structure/window/basic{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"H" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/airlock_sensor{
pixel_x = -24;
pixel_y = -25
},
/obj/effect/map_helper/airlock/sensor/int_sensor,
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"I" = (
/obj/machinery/atmospherics/binary/pump{
dir = 2
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"J" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"K" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/power/apc/super{
dir = 4;
pixel_x = 26
},
/obj/structure/cable/blue,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"L" = (
/obj/machinery/atmospherics/pipe/tank/air/full{
start_pressure = 10000
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"M" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/power/terminal{
dir = 4
},
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"N" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/turf/simulated/wall/shull,
/area/shuttle/pizza_shuttle)
"O" = (
/turf/simulated/wall/shull,
/area/shuttle/pizza_shuttle)
"P" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/sink/kitchen{
pixel_y = 17
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"Q" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 2;
health = 1e+006;
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 6
},
/turf/simulated/floor/plating,
/area/shuttle/pizza_shuttle)
"R" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/table/marble,
/obj/structure/window/basic{
dir = 1
},
/obj/machinery/reagentgrinder,
/obj/item/weapon/reagent_containers/glass/beaker,
/obj/structure/window/basic{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"S" = (
/obj/structure/table/marble,
/obj/item/pizzabox{
pixel_y = 5
},
/obj/item/pizzabox{
pixel_y = 5
},
/obj/item/pizzabox{
pixel_y = 5
},
/obj/item/pizzabox{
pixel_y = 5
},
/obj/item/pizzabox{
pixel_y = 5
},
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/fiftyspawner/cardboard,
/turf/simulated/floor/tiled/white,
/area/shuttle/pizza_shuttle)
"T" = (
/obj/machinery/computer/ship/engines{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"U" = (
/obj/structure/window/basic{
dir = 4
},
/obj/structure/table/marble,
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/item/weapon/reagent_containers/food/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
},
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{
pixel_x = -3
},
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{
pixel_x = 3
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
"V" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/fruitspawner/onion,
/obj/fruitspawner/onion,
/obj/fruitspawner/onion,
/obj/fruitspawner/onion,
/obj/fruitspawner/onion,
/obj/fruitspawner/tomato,
/obj/fruitspawner/tomato,
/obj/fruitspawner/tomato,
/obj/fruitspawner/tomato,
/obj/fruitspawner/tomato,
/obj/fruitspawner/corn,
/obj/fruitspawner/corn,
/obj/fruitspawner/corn,
/obj/fruitspawner/mushrooms,
/obj/fruitspawner/mushrooms,
/obj/fruitspawner/mushrooms,
/obj/fruitspawner/mushrooms,
/obj/fruitspawner/mushrooms,
/obj/fruitspawner/eggplant,
/obj/fruitspawner/eggplant,
/obj/fruitspawner/eggplant,
/obj/fruitspawner/carrot,
/obj/fruitspawner/carrot,
/obj/fruitspawner/carrot,
/obj/fruitspawner/spineapple,
/obj/fruitspawner/spineapple,
/obj/fruitspawner/spineapple,
/turf/simulated/floor/tiled/white,
/area/shuttle/pizza_shuttle)
"W" = (
/obj/machinery/computer/ship/helm{
req_one_access = null
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"X" = (
/obj/machinery/computer/ship/sensors{
dir = 8
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"Y" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/turf/simulated/floor/tiled/old_tile/red,
/area/shuttle/pizza_shuttle)
"Z" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/table/marble,
/obj/machinery/microwave{
pixel_x = -4;
pixel_y = 7
},
/turf/simulated/floor/tiled/old_tile/white,
/area/shuttle/pizza_shuttle)
(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
O
O
O
O
O
e
B
O
a
a
a
"}
(3,1,1) = {"
a
a
O
h
z
L
N
o
p
O
a
a
a
"}
(4,1,1) = {"
a
O
O
P
d
Z
r
F
n
O
O
a
a
"}
(5,1,1) = {"
a
j
S
d
d
d
m
d
H
f
Q
v
a
"}
(6,1,1) = {"
a
j
U
u
d
d
d
d
l
V
c
v
a
"}
(7,1,1) = {"
a
j
i
b
R
G
w
d
A
O
k
t
a
"}
(8,1,1) = {"
a
j
W
C
Y
M
J
J
q
Y
c
v
a
"}
(9,1,1) = {"
a
j
s
Y
X
x
K
y
T
I
g
v
a
"}
(10,1,1) = {"
a
O
O
O
O
O
O
O
O
O
O
a
a
"}
(11,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
"}

View File

@@ -0,0 +1,58 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "pizzashuttle-11x13.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/pizzashuttle
name = "OM Ship - Pizza Delivery Shuttle"
desc = "A small moderate condition pizza parlor on the go."
mappath = 'pizzashuttle-11x13.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/pizza_shuttle
name = "\improper Pizza Gut Shuttle"
icon_state = "shuttle2"
requires_power = 1
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/pizza_shuttle
name = "short jump console"
shuttle_tag = "Pizza Gut" //These names must match
req_one_access = list() //I might regret this
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/pizza_shuttle
name = "Origin - Pizza Gut"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_pizza_shuttle"
shuttle_type = /datum/shuttle/autodock/overmap/pizza_shuttle
// The 'shuttle'
/datum/shuttle/autodock/overmap/pizza_shuttle
name = "Pizza Gut" //These names must match
current_location = "omship_spawn_pizza_shuttle"
docking_controller_tag = "pizza_shuttle_docker" //This is the only thing you map in and var edit, use the map helpers to designate doors and pumps
shuttle_area = list(/area/shuttle/pizza_shuttle)
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/pizza_shuttle
name = "Pizza Gut" //These names must match
scanner_desc = @{"[i]Registration[/i]: PRIVATE
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
vessel_mass = 900 //YEET
vessel_size = SHIP_SIZE_TINY
shuttle = "Pizza Gut" //These names must match
/datum/map_template/shelter/superpose/pizzashuttle
shelter_id = "PizzaShuttle"
mappath = 'pizzashuttle-11x13.dmm'
name = "Pizza Gut Shuttle"
description = "A medium size pizza resturaunt ship."
superpose = FALSE
shuttle = TRUE

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,7 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "whiteship.dmm"
#include "whiteship-26x33.dmm"
#endif
// Map template for spawning the shuttle
@@ -16,6 +17,10 @@
icon_state = "shuttle2"
requires_power = 1
/area/shuttle/whiteshipOM2
name = "\improper White Ship mk II"
icon_state = "shuttle2"
requires_power = 1
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/whiteship
@@ -23,6 +28,11 @@
shuttle_tag = "White Ship"
req_one_access = ""
/obj/machinery/computer/shuttle_control/explore/whiteship2
name = "short jump console"
shuttle_tag = "White Ship II"
req_one_access = ""
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/whiteship
name = "White Ship" //These names must match
@@ -31,6 +41,13 @@
landmark_tag = "omship_spawn_whiteship"
shuttle_type = /datum/shuttle/autodock/overmap/whiteship
/obj/effect/shuttle_landmark/shuttle_initializer/whiteship2
name = "White Ship II" //These names must match
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_whiteship2"
shuttle_type = /datum/shuttle/autodock/overmap/whiteship2
// The 'shuttle'
/datum/shuttle/autodock/overmap/whiteship
name = "White Ship" //These names must match
@@ -39,6 +56,13 @@
shuttle_area = list(/area/shuttle/whiteshipOM)
defer_initialisation = TRUE //We're not loaded until an admin does it
/datum/shuttle/autodock/overmap/whiteship2
name = "White Ship II" //These names must match
current_location = "omship_spawn_whiteship2"
docking_controller_tag = "whiteship_docker2" //This is the only thing you map in and var edit, use the map helpers to designate doors and pumps
shuttle_area = list(/area/shuttle/whiteshipOM2)
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/whiteship
name = "White Ship" //These names must match
@@ -50,3 +74,23 @@
vessel_size = SHIP_SIZE_LARGE
shuttle = "White Ship" //These names must match
fore_dir = WEST
/obj/effect/overmap/visitable/ship/landable/whiteship2
name = "White Ship II" //These names must match
scanner_desc = @{"[i]Registration[/i]: PRIVATE
[i]Class[/i]: Medium Research Shuttle
[i]Transponder[/i]: Transmitting (SCI), non-hostile
[b]Notice[/b]: Medium sized research vessel"}
vessel_mass = 3000
vessel_size = SHIP_SIZE_LARGE
shuttle = "White Ship II" //These names must match
fore_dir = WEST
//Player accessable superposed pod
/datum/map_template/shelter/superpose/whiteship2
shelter_id = "WhiteShipII"
mappath = 'whiteship-26x33.dmm'
name = "White Ship Mk 22"
description = "A large titanium ship."
superpose = FALSE
shuttle = TRUE