From e3b8829be37f8a85eae2f20ad1bd31924d3eda89 Mon Sep 17 00:00:00 2001
From: cacogen <25089914+cacogen@users.noreply.github.com>
Date: Sat, 28 Dec 2019 17:09:30 +1300
Subject: [PATCH] Luxury shuttle improvements (#48395)
---
_maps/shuttles/emergency_luxury.dmm | 1116 +++++++++++------
code/datums/shuttles.dm | 2 +
.../game/machinery/computer/communications.dm | 2 +-
code/game/turfs/closed/_closed.dm | 6 +
code/modules/shuttle/emergency.dm | 2 +-
code/modules/shuttle/special.dm | 35 +-
6 files changed, 736 insertions(+), 427 deletions(-)
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 093f6d7b353..6c11e31b5f7 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -3,94 +3,82 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
-/turf/closed/indestructible/riveted/uranium,
+/turf/closed/indestructible/riveted/diamond,
/area/shuttle/escape/luxury)
"ac" = (
-/obj/machinery/door/airlock/external,
-/turf/open/floor/wood{
- icon_state = "wood-broken2"
+/obj/machinery/door/airlock/external{
+ name = "Steerage"
},
+/turf/open/floor/plastic,
/area/shuttle/escape/luxury)
"ad" = (
-/obj/machinery/door/airlock/gold,
-/obj/effect/forcefield/luxury_shuttle{
- name = "Ticket Booth"
+/obj/machinery/scanner_gate/luxury_shuttle{
+ layer = 2.6
},
-/turf/open/floor/mineral/gold,
+/obj/machinery/door/airlock/silver{
+ name = "First Class"
+ },
+/turf/open/floor/mineral/silver,
/area/shuttle/escape/luxury)
"ae" = (
/obj/docking_port/mobile/emergency{
dir = 2;
dwidth = 5;
height = 14;
- name = "Luxury emergency shuttle";
+ name = "Luxurious Emergency Shuttle";
width = 25
},
-/obj/machinery/door/airlock/gold,
-/obj/effect/forcefield/luxury_shuttle{
- name = "Ticket Booth"
+/obj/machinery/scanner_gate/luxury_shuttle{
+ layer = 2.6
},
-/turf/open/floor/mineral/gold,
+/obj/machinery/door/airlock/silver{
+ name = "First Class"
+ },
+/turf/open/floor/mineral/silver,
/area/shuttle/escape/luxury)
"af" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken3"
- },
-/area/shuttle/escape/luxury)
-"ag" = (
-/turf/open/floor/wood,
-/area/shuttle/escape/luxury)
-"ah" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/shuttle/escape/luxury)
-"ai" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/shuttle/escape/luxury)
-"aj" = (
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"ak" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-10"
- },
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"al" = (
-/obj/structure/mirror{
- pixel_y = 32
- },
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"am" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/shuttle/escape/luxury)
-"an" = (
-/obj/machinery/light/small,
-/turf/open/floor/wood{
- icon_state = "wood-broken2"
- },
-/area/shuttle/escape/luxury)
-"ao" = (
-/obj/machinery/light/small,
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/shuttle/escape/luxury)
-"ap" = (
-/obj/structure/toilet{
+/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"ag" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"aj" = (
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"ak" = (
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"al" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"am" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"an" = (
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"ap" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/luxury)
"aq" = (
-/obj/machinery/door/airlock/gold,
-/turf/open/floor/mineral/gold,
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/luxury)
"ar" = (
/obj/structure/shuttle/engine/propulsion{
@@ -108,269 +96,569 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape/luxury)
"at" = (
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"au" = (
-/obj/structure/chair/comfy,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"av" = (
-/obj/structure/chair/comfy{
+/obj/structure/chair/wood/wings{
dir = 4
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aw" = (
+"au" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"av" = (
+/obj/structure/chair/comfy/teal{
+ icon_state = "comfychair";
+ dir = 4
+ },
+/turf/open/floor/mineral/diamond,
+/area/shuttle/escape/luxury)
+"ax" = (
+/obj/structure/chair/wood/wings,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"aM" = (
/obj/machinery/computer/communications{
dir = 8
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/diamond,
/area/shuttle/escape/luxury)
-"ax" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti,
-/turf/open/floor/carpet,
+"aN" = (
+/obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"ay" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/notasandwich,
-/turf/open/floor/carpet,
+"aO" = (
+/obj/item/reagent_containers/food/snacks/notasandwich{
+ pixel_y = 11
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"az" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato,
-/turf/open/floor/carpet,
+"aP" = (
+/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aA" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/kebab/tofu,
-/turf/open/floor/carpet,
+"aQ" = (
+/obj/item/reagent_containers/food/snacks/kebab/tofu{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aB" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/honkdae,
-/turf/open/floor/carpet,
+"aR" = (
+/obj/item/reagent_containers/food/snacks/honkdae{
+ pixel_y = 8
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aC" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/enchiladas,
-/turf/open/floor/carpet,
+"aS" = (
+/obj/item/reagent_containers/food/snacks/enchiladas{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aD" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/candiedapple,
-/turf/open/floor/carpet,
+"aT" = (
+/obj/item/reagent_containers/food/snacks/candiedapple{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aE" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/burger/baconburger,
-/turf/open/floor/carpet,
+"aU" = (
+/obj/item/reagent_containers/food/snacks/burger/baconburger{
+ pixel_y = 2
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aF" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/benedict,
-/turf/open/floor/carpet,
+"aV" = (
+/obj/item/reagent_containers/food/snacks/benedict{
+ pixel_y = 1
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aG" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
-/turf/open/floor/carpet,
+"aW" = (
+/obj/item/reagent_containers/food/snacks/cakeslice/chocolate{
+ pixel_y = 1
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aH" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/spaghetti/chowmein,
-/turf/open/floor/carpet,
+"aX" = (
+/obj/item/reagent_containers/food/snacks/spaghetti/chowmein{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aI" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/dulcedebatataslice,
-/turf/open/floor/carpet,
+"aY" = (
+/obj/item/reagent_containers/food/snacks/dulcedebatataslice{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aJ" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/salad/validsalad,
-/turf/open/floor/carpet,
+"aZ" = (
+/obj/item/reagent_containers/food/snacks/salad/validsalad{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aK" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/carneburrito,
-/turf/open/floor/carpet,
+"ba" = (
+/obj/item/reagent_containers/food/snacks/carneburrito{
+ pixel_y = 4
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aL" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/chawanmushi,
-/turf/open/floor/carpet,
+"bb" = (
+/obj/item/reagent_containers/food/snacks/chawanmushi{
+ pixel_y = 2
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aM" = (
+"bc" = (
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/diamond,
/area/shuttle/escape/luxury)
-"aN" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/melonfruitbowl,
-/turf/open/floor/carpet,
+"bd" = (
+/obj/item/reagent_containers/food/snacks/melonfruitbowl{
+ pixel_y = 4
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
-"aO" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/khachapuri,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aP" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/grilledcheese,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aQ" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aR" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/honeybun,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aS" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/eggplantparm,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aT" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/spaghetti/copypasta,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aU" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/bearsteak,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aV" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aW" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cherrycupcake,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aX" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/customizable/pizza,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aY" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/hotdog,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"aZ" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/pie/grapetart,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"ba" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/burger/superbite,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"bb" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/snacks/cakeslice/slimecake,
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"bc" = (
+"be" = (
/obj/machinery/computer/station_alert{
dir = 8
},
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"bd" = (
-/obj/structure/chair/comfy{
- dir = 1
- },
-/turf/open/floor/carpet,
-/area/shuttle/escape/luxury)
-"be" = (
-/obj/machinery/computer/crew{
- dir = 8
- },
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/diamond,
/area/shuttle/escape/luxury)
"bf" = (
/obj/machinery/stasis,
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"bg" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-21";
- pixel_x = -3;
- pixel_y = 3
- },
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/silver,
/area/shuttle/escape/luxury)
"bh" = (
-/turf/open/floor/plating/beach/coastline_b,
+/turf/open/floor/holofloor/beach/coast_t{
+ dir = 2;
+ icon_state = "sandwater_inner"
+ },
/area/shuttle/escape/luxury)
"bi" = (
-/obj/machinery/light,
-/turf/open/floor/mineral/gold,
-/area/shuttle/escape/luxury)
-"bj" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape/luxury)
"bk" = (
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/silver,
/area/shuttle/escape/luxury)
"bl" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-10"
+/obj/machinery/door/poddoor/shutters/indestructible{
+ id = "ohnopoors"
},
-/obj/machinery/light{
- dir = 8
+/turf/open/floor/plating,
+/turf/closed/indestructible/opsglass{
+ desc = "A durable looking window made of an alloy of of plasma and titanium.";
+ name = "plastitanium window"
},
-/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"bp" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-21";
- pixel_x = -3;
- pixel_y = 3
+/obj/structure/chair/wood/wings{
+ dir = 8
},
/obj/machinery/light,
-/turf/open/floor/mineral/gold,
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"bC" = (
+/obj/structure/piano{
+ icon_state = "piano"
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"dR" = (
+/obj/machinery/light,
+/obj/structure/mirror{
+ pixel_x = -23;
+ pixel_y = -4;
+ pixel_z = 2
+ },
+/obj/structure/sink/greyscale{
+ custom_materials = list(/datum/material/gold = 2000);
+ dir = 4;
+ icon_state = "sink_greyscale";
+ pixel_x = -12
+ },
+/turf/open/floor/carpet/royalblack,
+/area/shuttle/escape/luxury)
+"gy" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"gT" = (
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/turf/open/floor/mineral/diamond,
+/area/shuttle/escape/luxury)
+"hm" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/trash/pistachios,
+/turf/open/floor/plating,
/area/shuttle/escape/luxury)
"hA" = (
/obj/structure/table/optable,
/obj/item/surgical_drapes,
-/turf/open/floor/mineral/gold,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"ip" = (
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"iY" = (
+/obj/machinery/door/airlock/silver{
+ name = "Restroom"
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"jt" = (
+/obj/structure/sign/poster/official/high_class_martini{
+ pixel_y = 32
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"jz" = (
+/obj/item/reagent_containers/food/snacks/pie/grapetart{
+ pixel_y = 4
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"ly" = (
+/obj/item/reagent_containers/food/snacks/grilledcheese{
+ pixel_y = 11
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"ny" = (
+/obj/structure/sign/poster/official/fruit_bowl{
+ pixel_x = -32;
+ pixel_y = 2
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"oP" = (
+/obj/item/reagent_containers/food/snacks/khachapuri{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"pa" = (
+/obj/machinery/vending/boozeomat,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"qm" = (
+/turf/closed/indestructible/riveted/diamond,
+/area/shuttle/escape)
+"tN" = (
+/turf/template_noop,
+/area/shuttle/escape/luxury)
+"wK" = (
+/obj/machinery/light,
+/turf/open/floor/holofloor/beach/coast_b,
+/area/shuttle/escape/luxury)
+"xM" = (
+/obj/item/reagent_containers/food/snacks/hotdog{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"xN" = (
+/turf/open/floor/holofloor/beach/coast_b{
+ icon_state = "sandwater_b";
+ dir = 9
+ },
+/area/shuttle/escape/luxury)
+"ye" = (
+/obj/machinery/vending/wallmed{
+ pixel_y = 31
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"yE" = (
+/obj/item/reagent_containers/food/snacks/cakeslice/slimecake{
+ pixel_y = 2
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
"zg" = (
-/obj/machinery/vending/wallmed,
-/turf/closed/indestructible/riveted/uranium,
+/obj/structure/table/glass,
+/obj/item/surgicaldrill/advanced,
+/obj/item/scalpel/advanced,
+/obj/item/retractor/advanced,
+/obj/item/hemostat/alien{
+ name = "hemostat"
+ },
+/obj/item/circular_saw/alien{
+ desc = "Technology so advanced it seems alien.";
+ name = "surgical saw"
+ },
+/obj/item/cautery/alien{
+ desc = "You've never seen technology this advanced before.";
+ name = "cautery"
+ },
+/turf/open/floor/mineral/silver,
/area/shuttle/escape/luxury)
-"OL" = (
-/obj/item/surgicaldrill,
-/obj/item/scalpel,
-/obj/item/retractor,
-/obj/item/cautery,
-/obj/item/hemostat,
-/obj/item/circular_saw,
-/obj/structure/table/wood/fancy,
-/turf/open/floor/mineral/gold,
+"Av" = (
+/obj/machinery/chem_dispenser/drinks{
+ name = "soda fountain";
+ pixel_y = 8
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"AB" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/storage/box/drinkingglasses{
+ pixel_y = 6
+ },
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/drinks/shaker{
+ pixel_y = 3
+ },
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Bs" = (
+/turf/open/floor/holofloor/beach/coast_b,
+/area/shuttle/escape/luxury)
+"BE" = (
+/obj/item/storage/box/drinkingglasses{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"BM" = (
+/turf/open/floor/holofloor/beach/coast_t{
+ dir = 8;
+ icon_state = "sandwater_inner"
+ },
+/area/shuttle/escape/luxury)
+"BT" = (
+/obj/machinery/scanner_gate/luxury_shuttle{
+ layer = 2.6
+ },
+/obj/machinery/door/airlock/silver{
+ name = "Steerage"
+ },
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"Cz" = (
+/obj/item/reagent_containers/food/snacks/burger/superbite{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"GA" = (
+/obj/structure/chair/wood/wings{
+ dir = 1
+ },
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Ji" = (
+/turf/open/floor/holofloor/beach/coast_t,
+/area/shuttle/escape/luxury)
+"Jt" = (
+/turf/open/floor/holofloor/beach/coast_t{
+ icon_state = "sandwater_t";
+ dir = 8
+ },
+/area/shuttle/escape/luxury)
+"Ky" = (
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
+"Lm" = (
+/obj/item/reagent_containers/food/snacks/cherrycupcake{
+ pixel_y = 2
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"LP" = (
+/obj/machinery/vending/wallmed{
+ name = "Emergency NanoMed";
+ use_power = 0
+ },
+/turf/closed/indestructible/riveted/diamond,
+/area/shuttle/escape/luxury)
+"Mg" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/reagent_containers/food/drinks/bottle/champagne{
+ pixel_y = 11
+ },
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"MI" = (
+/obj/structure/toilet/greyscale{
+ custom_materials = list(/datum/material/gold = 2000);
+ dir = 8;
+ icon_state = "toilet00"
+ },
+/turf/open/floor/carpet/royalblack,
+/area/shuttle/escape/luxury)
+"MJ" = (
+/obj/machinery/chem_dispenser/drinks/beer{
+ name = "aperitif fountain";
+ pixel_y = 8
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Nr" = (
+/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Pw" = (
+/turf/open/floor/holofloor/beach/coast_t{
+ icon_state = "sandwater_t";
+ dir = 4
+ },
+/area/shuttle/escape/luxury)
+"PA" = (
+/obj/item/reagent_containers/food/snacks/bearsteak{
+ pixel_y = 6
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"PE" = (
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"QU" = (
+/obj/item/reagent_containers/food/snacks/customizable/pizza{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"RL" = (
+/obj/machinery/button/door{
+ id = "ohnopoors";
+ name = "window shutters";
+ pixel_x = -26;
+ pixel_y = -5;
+ req_access_txt = "0"
+ },
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"Uc" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Escape Shuttle Cell";
+ req_access_txt = "2"
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"Vf" = (
+/obj/item/reagent_containers/food/snacks/eggplantparm{
+ pixel_y = 3
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"VT" = (
+/obj/item/reagent_containers/food/snacks/spaghetti/copypasta{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Wv" = (
+/obj/machinery/scanner_gate/luxury_shuttle{
+ layer = 2.6
+ },
+/obj/machinery/door/airlock/diamond{
+ name = "Undesirables";
+ req_access_txt = "2"
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
+"Wy" = (
+/turf/open/floor/holofloor/beach/coast_b{
+ icon_state = "sandwater_b";
+ dir = 5
+ },
+/area/shuttle/escape/luxury)
+"Xe" = (
+/obj/structure/chair/wood/wings{
+ dir = 8
+ },
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Xm" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape/luxury)
+"XG" = (
+/obj/item/reagent_containers/food/snacks/honeybun{
+ pixel_y = 1
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
+/area/shuttle/escape/luxury)
+"Yr" = (
+/obj/machinery/light,
+/turf/open/floor/mineral/silver,
+/area/shuttle/escape/luxury)
+"Yz" = (
+/obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti{
+ pixel_y = 5
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/cyan,
/area/shuttle/escape/luxury)
(1,1,1) = {"
-aa
+tN
ab
ab
ab
@@ -389,7 +677,7 @@ aa
ab
ab
am
-ab
+af
ab
as
as
@@ -398,12 +686,13 @@ as
ab
bf
hA
-ab
+LP
ab
"}
(3,1,1) = {"
ab
af
+ip
ag
ab
ab
@@ -411,250 +700,249 @@ ab
ab
ab
ab
-zg
-aj
+ye
aj
zg
ab
"}
(4,1,1) = {"
ab
-ag
+af
an
-ab
+af
bl
aj
aj
+ny
+aj
aj
aj
-bj
aj
aj
-OL
ab
"}
(5,1,1) = {"
ab
ag
-ag
-ab
+ip
+af
+bl
aj
+PE
at
at
-at
-at
-aj
-aj
+PE
aj
aj
+bC
ab
"}
(6,1,1) = {"
ab
-ag
-ag
-ab
+af
+ip
+hm
+bl
aj
-au
ax
aN
bd
+GA
aj
aj
-bg
bp
ab
"}
(7,1,1) = {"
ab
-ah
-ag
-ab
+af
+ip
+af
+bl
aj
-au
-ay
+ax
aO
-bd
-aj
+oP
+GA
aj
bh
-bh
+Pw
ab
"}
(8,1,1) = {"
ab
ag
-ag
-ab
+ip
+af
+bl
aj
-au
-az
+ax
aP
-bd
+ly
+GA
aj
-aj
-bh
-bh
+Ji
+xN
ab
"}
(9,1,1) = {"
ab
-ag
-ag
-ab
+af
+Ky
+af
+bl
aj
-au
-aA
+ax
aQ
-bd
+Nr
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(10,1,1) = {"
ab
-ai
-ao
-ab
+af
+ip
+af
+bl
aj
-au
-aB
+ax
aR
-bd
+XG
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(11,1,1) = {"
ab
+af
+ip
ag
-ag
-ab
+bl
aj
-au
-aC
+ax
aS
-bd
+Vf
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(12,1,1) = {"
ac
-ag
+gy
+ip
af
-ab
+bl
aj
-au
-aD
+ax
aT
-bd
+VT
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(13,1,1) = {"
ab
ab
+BT
ab
ab
-aj
au
-aE
+ax
aU
-bd
+PA
+GA
aj
-aj
-bh
-bh
+Ji
+wK
ab
"}
(14,1,1) = {"
ad
aj
aj
-bj
aj
-au
-aF
+RL
+aj
+ax
aV
-bd
+Yz
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(15,1,1) = {"
ab
+jt
aj
aj
aj
aj
-au
-aG
+ax
aW
-bd
+Lm
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(16,1,1) = {"
ab
+MJ
+PE
+BE
aj
aj
-aj
-aj
-au
-aH
+ax
aX
-bd
+QU
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(17,1,1) = {"
ab
+pa
+PE
+Mg
aj
aj
-aj
-aj
-au
-aI
+ax
aY
-bd
+xM
+GA
aj
-aj
-bh
-bh
+Ji
+Bs
ab
"}
(18,1,1) = {"
ab
+Av
+PE
+AB
aj
aj
-aj
-aj
-au
-aJ
+ax
aZ
-bd
+jz
+GA
aj
-aj
-bh
-bh
+Ji
+Wy
ab
"}
(19,1,1) = {"
@@ -663,14 +951,14 @@ aj
aj
aj
aj
-au
-aK
+aj
+ax
ba
-bd
+Cz
+GA
aj
-aj
-bh
-bh
+BM
+Jt
ab
"}
(20,1,1) = {"
@@ -679,14 +967,14 @@ aj
aj
bk
aj
-au
-aL
+aj
+ax
bb
-bd
+yE
+GA
aj
aj
-bg
-bp
+Yr
ab
"}
(21,1,1) = {"
@@ -694,21 +982,22 @@ ab
ab
ab
ab
+ab
aj
-at
-at
-at
-at
-aj
+PE
+Xe
+Xe
+PE
aj
aj
aj
ab
"}
(22,1,1) = {"
-ab
+Uc
ak
ap
+ap
ab
aj
aj
@@ -716,41 +1005,40 @@ aj
aj
aj
aj
-aj
-aj
-aj
+ab
+ab
ab
"}
(23,1,1) = {"
-ab
-aj
+qm
+ak
bi
-ab
+bi
+Wv
aj
av
av
av
av
aj
-aj
-aj
-aj
+iY
+dR
ab
"}
(24,1,1) = {"
-ab
+qm
al
-aj
+Xm
aq
+ab
bk
-aw
aM
bc
be
-bk
+gT
aj
-aj
-ak
+ab
+MI
ab
"}
(25,1,1) = {"
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index d64d5d06908..df39eeb7763 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -16,6 +16,7 @@
var/port_x_offset
var/port_y_offset
+ var/extra_desc = ""
/datum/map_template/shuttle/proc/prerequisites_met()
return TRUE
@@ -226,6 +227,7 @@
suffix = "luxury"
name = "Luxury Shuttle"
description = "A luxurious golden shuttle complete with an indoor swimming pool. Each crewmember wishing to board must bring 500 credits, payable in cash and mineral coin."
+ extra_desc = "This shuttle costs 500 credits to board."
admin_notes = "Due to the limited space for non paying crew, this shuttle may cause a riot."
credit_cost = 10000
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index e45d67f8b13..878ce5482dc 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -169,7 +169,7 @@
SSshuttle.existing_shuttle = SSshuttle.emergency
SSshuttle.action_load(S)
D.adjust_money(-S.credit_cost)
- minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
+ minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits.[S.extra_desc ? " [S.extra_desc]" : ""]" , "Shuttle Purchase")
message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
else
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 9c67405a0aa..c0a00ed35ef 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -86,6 +86,12 @@
icon = 'icons/turf/walls/uranium_wall.dmi'
icon_state = "uranium"
+/turf/closed/indestructible/riveted/diamond
+ name = "diamond wall"
+ desc = "A wall with diamond plating. You monster."
+ icon = 'icons/turf/walls/diamond_wall.dmi'
+ icon_state = "diamond"
+
/turf/closed/indestructible/abductor
icon_state = "alien1"
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index a974b1b4ff0..cde49bc8906 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -316,7 +316,7 @@
mode = SHUTTLE_DOCKED
setTimer(SSshuttle.emergencyDockTime)
send2tgs("Server", "The Emergency Shuttle has docked with the station.")
- priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/ai/shuttledock.ogg', "Priority")
+ priority_announce("[SSshuttle.emergency] has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/ai/shuttledock.ogg', "Priority")
ShuttleDBStuff()
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index 849e042696c..d0ef7fd2c50 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -213,17 +213,19 @@
//Luxury Shuttle Blockers
-/obj/effect/forcefield/luxury_shuttle
- name = "luxury shuttle ticket booth"
- desc = "A forceful money collector."
- timeleft = 0
+/obj/machinery/scanner_gate/luxury_shuttle
+ name = "luxury shuttle ticket field"
+ density = FALSE //allows shuttle airlocks to close, nothing but an approved passenger gets past CanPass
+ locked = TRUE
+ use_power = FALSE
var/threshold = 500
var/static/list/approved_passengers = list()
var/static/list/check_times = list()
var/list/payees = list()
-/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
+/obj/machinery/scanner_gate/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
if(mover in approved_passengers)
+ set_scanline("scanning", 10)
return TRUE
if(!isliving(mover)) //No stowaways
@@ -231,10 +233,19 @@
return FALSE
+/obj/machinery/scanner_gate/luxury_shuttle/Crossed(atom/movable/AM)
+ return
+
+/obj/machinery/scanner_gate/luxury_shuttle/attackby(obj/item/W, mob/user, params)
+ return
+
+/obj/machinery/scanner_gate/luxury_shuttle/emag_act(mob/user)
+ return
#define LUXURY_MESSAGE_COOLDOWN 100
-/obj/effect/forcefield/luxury_shuttle/Bumped(atom/movable/AM)
+/obj/machinery/scanner_gate/luxury_shuttle/Bumped(atom/movable/AM)
if(!isliving(AM))
+ alarm_beep()
return ..()
var/datum/bank_account/account
@@ -315,18 +326,18 @@
var/change = FALSE
if(payees[AM] > 0)
change = TRUE
- var/obj/item/holochip/HC
+ var/obj/item/holochip/HC = new /obj/item/holochip(AM.loc)
HC.credits = payees[AM]
+ HC.name = "[HC.credits] credit holochip"
if(istype(AM, /mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
- if(!H.put_in_hands(new HC))
+ if(!H.put_in_hands(HC))
AM.pulling = HC
else
- new HC(AM.loc)
AM.pulling = HC
payees[AM] -= payees[AM]
- say("Welcome aboard, [AM]![change ? " Here is your change." : ""]")
+ say("Welcome to first class, [AM]![change ? " Here is your change." : ""]")
approved_passengers += AM
check_times -= AM
@@ -335,10 +346,12 @@
for(var/obj/I in counted_money)
qdel(I)
if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message
- to_chat(AM, "$[payees[AM]] received. You need $[threshold-payees[AM]] more.")
+ to_chat(AM, "[payees[AM]] credits received. You need [threshold-payees[AM]] more.")
check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
+ alarm_beep()
return ..()
else
+ alarm_beep()
return ..()
/mob/living/simple_animal/hostile/bear/fightpit