From 12a5b43df3c8c620fc25d48305cba73453a17761 Mon Sep 17 00:00:00 2001
From: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:58:13 +0300
Subject: [PATCH] Tweaks Casino Ship and Bearcat (#561)
---
code/game/machinery/doors/airlock.dm | 53 +-
maps/away/bearcat/bearcat-1.dmm | 36 +-
maps/away/bearcat/bearcat-2.dmm | 155 ++---
maps/away/bearcat/bearcat.dm | 54 +-
maps/away/bearcat/bearcat_access.dm | 36 -
maps/away/bearcat/bearcat_jobs.dm | 22 +-
maps/away/bearcat/bearcat_objects.dm | 82 +++
maps/away/casino/casino.dm | 85 +--
maps/away/casino/casino.dmm | 988 +++++++++++++++++++++------
maps/away/casino/casino_objects.dm | 165 +++++
10 files changed, 1173 insertions(+), 503 deletions(-)
create mode 100644 maps/away/bearcat/bearcat_objects.dm
create mode 100644 maps/away/casino/casino_objects.dm
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 204749694b5..abff9528a41 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1473,16 +1473,61 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/autoname
-/obj/machinery/door/airlock/autoname/New()
+/obj/machinery/door/airlock/autoname/Initialize()
+ . = ..()
var/area/A = get_area(src)
name = A.name
- ..()
-/obj/machinery/door/airlock/proc/paint_airlock(var/paint_color)
+/obj/machinery/door/airlock/autoname/command
+ door_color = COLOR_COMMAND_BLUE
+
+/obj/machinery/door/airlock/autoname/security
+ door_color = COLOR_NT_RED
+
+/obj/machinery/door/airlock/autoname/security/research
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_NT_RED
+
+/obj/machinery/door/airlock/autoname/engineering
+ name = "Maintenance Hatch"
+ door_color = COLOR_AMBER
+
+/obj/machinery/door/airlock/autoname/medical
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/autoname/virology
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_GREEN
+
+/obj/machinery/door/airlock/autoname/mining
+ name = "Mining Airlock"
+ door_color = COLOR_PALE_ORANGE
+ stripe_color = COLOR_BEASTY_BROWN
+
+/obj/machinery/door/airlock/autoname/atmos
+ door_color = COLOR_AMBER
+ stripe_color = COLOR_CYAN
+
+/obj/machinery/door/airlock/autoname/research
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_BOTTLE_GREEN
+
+/obj/machinery/door/airlock/autoname/science
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_VIOLET
+
+/obj/machinery/door/airlock/autoname/sol
+ door_color = COLOR_BLUE_GRAY
+
+/obj/machinery/door/airlock/autoname/civilian
+ stripe_color = COLOR_CIVIE_GREEN
+
+/obj/machinery/door/airlock/proc/paint_airlock(paint_color)
door_color = paint_color
update_icon()
-/obj/machinery/door/airlock/proc/stripe_airlock(var/paint_color)
+/obj/machinery/door/airlock/proc/stripe_airlock(paint_color)
stripe_color = paint_color
update_icon()
diff --git a/maps/away/bearcat/bearcat-1.dmm b/maps/away/bearcat/bearcat-1.dmm
index 87463ffde73..55bd442c311 100644
--- a/maps/away/bearcat/bearcat-1.dmm
+++ b/maps/away/bearcat/bearcat-1.dmm
@@ -338,7 +338,7 @@
/turf/simulated/wall/r_wall,
/area/ship/scrap/gambling)
"aM" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -396,7 +396,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo/lower)
"aS" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -604,7 +604,7 @@
/turf/simulated/floor,
/area/ship/scrap/gambling)
"bm" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -638,7 +638,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"bo" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor,
/area/ship/scrap/cargo/lower)
"bp" = (
@@ -731,7 +731,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"bw" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -1185,7 +1185,7 @@
/turf/simulated/floor,
/area/ship/scrap/broken2)
"cq" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -1267,7 +1267,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"cy" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -1401,7 +1401,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"cP" = (
@@ -1676,7 +1676,7 @@
/turf/simulated/floor,
/area/ship/scrap/broken1)
"dn" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -1724,7 +1724,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo/lower)
"ds" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -1816,7 +1816,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/broken1)
"dA" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo/lower)
"dB" = (
@@ -1827,7 +1827,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor,
/area/ship/scrap/cargo/lower)
"dC" = (
@@ -1916,7 +1916,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"dL" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -2036,7 +2036,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/lower)
"dS" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -2085,7 +2085,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor,
/area/ship/scrap/maintenance/storage)
"dY" = (
@@ -2284,7 +2284,7 @@
/turf/simulated/floor,
/area/ship/scrap/maintenance/techstorage)
"eq" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -2386,7 +2386,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -2817,7 +2817,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/crew/dorms3)
"EP" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
diff --git a/maps/away/bearcat/bearcat-2.dmm b/maps/away/bearcat/bearcat-2.dmm
index 90fca3dbe85..6e7899a75b2 100644
--- a/maps/away/bearcat/bearcat-2.dmm
+++ b/maps/away/bearcat/bearcat-2.dmm
@@ -68,7 +68,7 @@
dir = 1;
icon_state = "comfychair_preview"
},
-/obj/effect/landmark/deadcap,
+/obj/effect/landmark/corpse/bearcat_captain,
/turf/simulated/floor/tiled/dark,
/area/ship/scrap/command/bridge)
"ak" = (
@@ -231,7 +231,7 @@
"aE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/command/bearcat,
+/obj/machinery/door/airlock/autoname/command,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -372,7 +372,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/autoname/command/bearcat,
+/obj/machinery/door/airlock/autoname/command,
/turf/simulated/floor/tiled/dark,
/area/ship/scrap/comms)
"aR" = (
@@ -407,7 +407,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/autoname/command/bearcat,
+/obj/machinery/door/airlock/autoname/command,
/turf/simulated/floor/tiled/dark,
/area/ship/scrap/command/captain)
"aT" = (
@@ -558,7 +558,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/autoname/command/bearcat,
+/obj/machinery/door/airlock/autoname/command,
/turf/simulated/floor/tiled/dark,
/area/ship/scrap/dock)
"bg" = (
@@ -647,7 +647,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/dock)
"bp" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -959,7 +959,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
@@ -1022,7 +1022,7 @@
/turf/simulated/wall/r_wall,
/area/ship/scrap/dock)
"bU" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/ship/scrap/dock)
@@ -1105,7 +1105,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
@@ -1283,7 +1283,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/toilets)
"cH" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/hallway/port)
@@ -1335,7 +1335,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/saloon)
"cM" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/hallway/starboard)
@@ -1354,7 +1354,6 @@
/obj/item/clothing/mask/breath/emergency,
/obj/item/clothing/mask/breath/emergency,
/obj/item/clothing/mask/breath/emergency,
-/obj/item/crowbar,
/obj/item/tank/oxygen,
/obj/item/tank/oxygen,
/obj/item/tank/oxygen,
@@ -1475,7 +1474,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/saloon)
@@ -1797,7 +1796,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1818,7 +1817,7 @@
/turf/simulated/wall,
/area/ship/scrap/crew/medbay)
"dC" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor/tiled/white,
/area/ship/scrap/crew/medbay)
"dD" = (
@@ -2230,7 +2229,7 @@
icon_state = "4-8";
pixel_y = 0
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2263,7 +2262,7 @@
icon_state = "4-8";
pixel_y = 0
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2502,7 +2501,7 @@
dir = 4;
icon_state = "intact"
},
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/port)
"eD" = (
@@ -2558,7 +2557,7 @@
/area/ship/scrap/crew/kitchen)
"eH" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor/tiled,
/area/ship/scrap/crew/hallway/port)
"eI" = (
@@ -2624,7 +2623,7 @@
icon_state = "1-2";
pixel_y = 0
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor,
/area/ship/scrap/crew/hallway/starboard)
"eO" = (
@@ -2692,7 +2691,7 @@
dir = 4;
icon_state = "intact"
},
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor,
/area/ship/scrap/maintenance/engine/starboard)
"eT" = (
@@ -3222,7 +3221,7 @@
/turf/simulated/floor,
/area/ship/scrap/crew/hallway/starboard)
"fP" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4;
icon_state = "intact"
@@ -3438,7 +3437,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo)
"gi" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo)
"gj" = (
@@ -3499,7 +3498,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3566,7 +3565,7 @@
/turf/simulated/floor/tiled,
/area/ship/scrap/cargo)
"gt" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4029,7 +4028,7 @@
/area/ship/scrap/maintenance/atmos)
"gZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor/tiled,
/area/ship/scrap/maintenance/atmos)
"ha" = (
@@ -4052,7 +4051,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor/tiled,
/area/ship/scrap/maintenance/engineering)
"he" = (
@@ -4108,7 +4107,6 @@
/obj/machinery/power/apc/derelict{
dir = 1
},
-/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/tiled/airless,
/area/ship/scrap/maintenance/atmos)
"hl" = (
@@ -4125,6 +4123,7 @@
/obj/machinery/light_switch{
pixel_y = 25
},
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/tiled/airless,
/area/ship/scrap/maintenance/atmos)
"hm" = (
@@ -4316,7 +4315,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor/tiled,
/area/ship/scrap/maintenance/atmos)
"hC" = (
@@ -4448,7 +4447,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/turf/simulated/floor/tiled,
/area/ship/scrap/maintenance/power)
"hJ" = (
@@ -4515,7 +4514,6 @@
id = "n2_in";
use_power = 1
},
-/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/maintenance/atmos)
"hP" = (
@@ -4671,7 +4669,7 @@
pixel_x = -24;
req_access = newlist()
},
-/mob/living/simple_animal/hostile/carp,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor,
/area/ship/scrap/maintenance/power)
"ia" = (
@@ -4737,7 +4735,7 @@
"ii" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/door/airlock/autoname/engineering/bearcat,
+/obj/machinery/door/airlock/autoname/engineering,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -4794,8 +4792,8 @@
/area/ship/scrap/maintenance/power)
"io" = (
/obj/structure/lattice,
-/mob/living/simple_animal/hostile/carp,
-/turf/space,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
+/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/atmos)
"iq" = (
/obj/structure/window/reinforced{
@@ -4915,7 +4913,7 @@
d2 = 2;
icon_state = "0-2"
},
-/mob/living/simple_animal/hostile/carp,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/tiled,
/area/ship/scrap/maintenance/power)
"iC" = (
@@ -4966,6 +4964,10 @@
"iH" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
+/obj/structure/window/phoronreinforced{
+ anchored = 0;
+ dir = 1
+ },
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"iI" = (
@@ -4973,7 +4975,6 @@
dir = 9;
icon_state = "intact"
},
-/mob/living/simple_animal/hostile/carp,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"iJ" = (
@@ -5023,7 +5024,6 @@
/area/ship/scrap/maintenance/power)
"iO" = (
/obj/item/stack/material/rods,
-/mob/living/simple_animal/hostile/carp,
/turf/space,
/area/ship/scrap/maintenance/atmos)
"iP" = (
@@ -5099,22 +5099,16 @@
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"iV" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
/obj/structure/window/phoronreinforced{
- dir = 8;
- icon_state = "phoronrwindow"
+ dir = 8
},
/obj/structure/window/phoronreinforced{
- dir = 1;
- icon_state = "phoronrwindow"
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/maintenance/engine/aft)
"iW" = (
-/obj/structure/window/phoronreinforced{
- dir = 1;
- icon_state = "phoronrwindow"
- },
/obj/machinery/meter/turf,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 6
@@ -5122,14 +5116,6 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/maintenance/engine/aft)
"iX" = (
-/obj/structure/window/phoronreinforced{
- dir = 4;
- icon_state = "phoronrwindow"
- },
-/obj/structure/window/phoronreinforced{
- dir = 1;
- icon_state = "phoronrwindow"
- },
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 10
},
@@ -5138,6 +5124,9 @@
icon_state = "map_injector";
use_power = 1
},
+/obj/structure/window/phoronreinforced{
+ dir = 1
+ },
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/maintenance/engine/aft)
"iY" = (
@@ -5148,6 +5137,9 @@
/obj/item/stack/material/glass/phoronrglass{
amount = 20
},
+/obj/structure/window/phoronreinforced{
+ dir = 8
+ },
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"iZ" = (
@@ -5215,14 +5207,12 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/machinery/meter,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"jg" = (
-/obj/structure/window/phoronreinforced{
- dir = 8;
- icon_state = "phoronrwindow"
- },
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/obj/item/material/shard/phoron,
/turf/simulated/floor/reinforced/airless,
/area/ship/scrap/maintenance/engine/aft)
"jh" = (
@@ -5292,6 +5282,10 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 5
},
+/obj/structure/window/phoronreinforced,
+/obj/structure/window/phoronreinforced{
+ dir = 8
+ },
/turf/simulated/floor/reinforced,
/area/ship/scrap/maintenance/engine/aft)
"ju" = (
@@ -5299,14 +5293,11 @@
dir = 9
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/structure/window/phoronreinforced,
/turf/simulated/floor/reinforced,
/area/ship/scrap/maintenance/engine/aft)
"jv" = (
/obj/structure/window/phoronreinforced,
-/obj/structure/window/phoronreinforced{
- dir = 4;
- icon_state = "phoronrwindow"
- },
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 1
},
@@ -5321,13 +5312,15 @@
/turf/simulated/floor/reinforced,
/area/ship/scrap/maintenance/engine/aft)
"jw" = (
-/obj/structure/window/phoronreinforced{
- dir = 1;
- icon_state = "phoronrwindow"
- },
/obj/machinery/atmospherics/binary/pump{
dir = 4
},
+/obj/structure/window/phoronreinforced{
+ dir = 1
+ },
+/obj/structure/window/phoronreinforced{
+ dir = 8
+ },
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"jx" = (
@@ -5401,9 +5394,9 @@
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"jG" = (
-/obj/item/material/shard/phoron,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/airless,
-/area/ship/scrap/maintenance/engine/aft)
+/area/ship/scrap/maintenance/atmos)
"jH" = (
/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
/turf/simulated/floor/airless,
@@ -5460,7 +5453,7 @@
icon_state = "map"
},
/obj/effect/floor_decal/industrial/warning,
-/mob/living/simple_animal/hostile/carp,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"jQ" = (
@@ -5491,11 +5484,6 @@
/obj/structure/closet/crate/solar_assembly,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
-"jT" = (
-/obj/structure/lattice,
-/mob/living/simple_animal/hostile/carp,
-/turf/space,
-/area/ship/scrap/maintenance/engine/aft)
"jU" = (
/obj/item/stack/material/plasteel,
/obj/structure/lattice,
@@ -5611,6 +5599,7 @@
icon_state = "intact"
},
/obj/effect/decal/cleanable/ash,
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn,
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/engine/aft)
"uM" = (
@@ -5711,7 +5700,7 @@
/turf/simulated/floor/airless,
/area/ship/scrap/maintenance/atmos)
"IL" = (
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -5841,7 +5830,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/autoname/bearcat,
+/obj/machinery/door/airlock/autoname,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -11744,10 +11733,10 @@ aa
aa
wp
vs
-sy
+io
hM
id
-io
+Eq
id
iO
Yl
@@ -12114,7 +12103,7 @@ zT
hO
HQ
hx
-hx
+jG
IG
Mm
hN
@@ -12608,7 +12597,7 @@ gY
gY
hx
jN
-jT
+jV
aa
aa
aa
@@ -12850,7 +12839,7 @@ iG
iV
jg
jt
-jG
+jF
jF
jV
jX
@@ -12972,7 +12961,7 @@ iH
iW
jh
ju
-jG
+jF
Wu
jF
jF
diff --git a/maps/away/bearcat/bearcat.dm b/maps/away/bearcat/bearcat.dm
index e2d87113137..a889728b029 100644
--- a/maps/away/bearcat/bearcat.dm
+++ b/maps/away/bearcat/bearcat.dm
@@ -1,6 +1,7 @@
#include "bearcat_areas.dm"
#include "bearcat_jobs.dm"
#include "bearcat_access.dm"
+#include "bearcat_objects.dm"
#include "bearcat_radio.dm"
/obj/effect/submap_landmark/joinable_submap/bearcat
@@ -22,13 +23,13 @@
max_speed = 1/(10 SECONDS)
burn_delay = 10 SECONDS
-/obj/effect/overmap/visitable/ship/bearcat/New()
+/obj/effect/overmap/visitable/ship/bearcat/Initialize()
+ . = ..()
name = "[pick("FTV","ITV","IEV")] [pick("Bearcat", "Firebug", "Defiant", "Unsinkable","Horizon","Vagrant")]"
for(var/area/ship/scrap/A)
A.name = "\improper [name] - [A.name]"
GLOB.using_map.area_purity_test_exempt_areas += A.type
name = "[name], \a [initial(name)]"
- ..()
/datum/map_template/ruin/away_site/bearcat_wreck
name = "Bearcat Wreck"
@@ -85,52 +86,3 @@
landmark_tag = "nav_bearcat_lift_bottom"
base_area = /area/ship/scrap/cargo/lower
base_turf = /turf/simulated/floor
-
-/obj/machinery/power/apc/derelict
- cell_type = /obj/item/cell/crap/empty
- locked = 0
- coverlocked = 0
-
-/obj/machinery/door/airlock/autoname/command
- door_color = COLOR_COMMAND_BLUE
-
-/obj/machinery/door/airlock/autoname/engineering
- door_color = COLOR_AMBER
-
-/obj/effect/landmark/deadcap
- name = "Dead Captain"
- delete_me = 1
-
-/obj/effect/landmark/deadcap/Initialize()
- var/turf/T = get_turf(src)
- var/mob/living/carbon/human/corpse = new(T)
- scramble(1,corpse,100)
- corpse.real_name = "Captain"
- corpse.name = "Captain"
- var/decl/hierarchy/outfit/outfit = outfit_by_type(/decl/hierarchy/outfit/deadcap)
- outfit.equip(corpse)
- corpse.adjustOxyLoss(corpse.maxHealth)
- corpse.setBrainLoss(corpse.maxHealth)
- var/obj/structure/bed/chair/C = locate() in T
- if(C)
- C.buckle_mob(corpse)
- . = ..()
-
-/decl/hierarchy/outfit/deadcap
- name = "Derelict Captain"
- uniform = /obj/item/clothing/under/casual_pants/classicjeans
- suit = /obj/item/clothing/suit/storage/hooded/wintercoat
- shoes = /obj/item/clothing/shoes/black
- r_pocket = /obj/item/device/radio/map_preset/bearcat
-
-/decl/hierarchy/outfit/deadcap/post_equip(mob/living/carbon/human/H)
- ..()
- var/obj/item/clothing/uniform = H.w_uniform
- if(uniform)
- var/obj/item/clothing/accessory/toggleable/hawaii/random/eyegore = new()
- if(uniform.can_attach_accessory(eyegore))
- uniform.attach_accessory(null, eyegore)
- else
- qdel(eyegore)
- var/obj/item/cell/super/C = new()
- H.put_in_any_hand_if_possible(C)
diff --git a/maps/away/bearcat/bearcat_access.dm b/maps/away/bearcat/bearcat_access.dm
index ad59118530a..34a501535f9 100644
--- a/maps/away/bearcat/bearcat_access.dm
+++ b/maps/away/bearcat/bearcat_access.dm
@@ -9,39 +9,3 @@
id = access_bearcat_captain
desc = "FTU Captain"
region = ACCESS_REGION_NONE
-
-/obj/item/card/id/bearcat
- access = list(access_bearcat)
-
-/obj/item/card/id/bearcat_captain
- access = list(access_bearcat, access_bearcat_captain)
-
-/obj/machinery/door/airlock/autoname/bearcat
-
-/obj/machinery/door/airlock/autoname/engineering/bearcat
-
-/obj/machinery/door/airlock/autoname/command/bearcat
-
-/obj/structure/closet/secure_closet/engineering_electrical/bearcat
- req_access = list(access_bearcat)
-
-/obj/structure/closet/secure_closet/engineering_welding/bearcat
- req_access = list(access_bearcat)
-
-/obj/structure/closet/secure_closet/freezer/fridge/bearcat
- req_access = list(access_bearcat)
-
-/obj/structure/closet/secure_closet/freezer/meat/bearcat
- req_access = list(access_bearcat)
-
-/obj/machinery/vending/engineering/bearcat
- req_access = list(access_bearcat)
-
-/obj/machinery/vending/tool/bearcat
- req_access = list(access_bearcat)
-
-/obj/machinery/suit_storage_unit/engineering/salvage/bearcat
- req_access = list(access_bearcat)
-
-/obj/machinery/suit_cycler/salvage/bearcat
- req_access = list(access_bearcat)
\ No newline at end of file
diff --git a/maps/away/bearcat/bearcat_jobs.dm b/maps/away/bearcat/bearcat_jobs.dm
index e1912f861ea..a6e186d99fa 100644
--- a/maps/away/bearcat/bearcat_jobs.dm
+++ b/maps/away/bearcat/bearcat_jobs.dm
@@ -1,14 +1,14 @@
/datum/job/submap/bearcat_captain
- title = "Independant Captain"
+ title = "Independent Captain"
total_positions = 1
outfit_type = /decl/hierarchy/outfit/job/bearcat/captain
- supervisors = "your bottom line"
+ supervisors = "None"
info = "Your ship has suffered a catastrophic amount of damage, leaving it dark and crippled in the depths of \
unexplored space. The Captain is dead, leaving you, previously the First Mate in charge. Organize what's left of \
your crew, and maybe you'll be able to survive long enough to be rescued."
/datum/job/submap/bearcat_crewman
- title = "Independant Crewman"
+ title = "Independent Crewman"
supervisors = "the Captain"
total_positions = 3
outfit_type = /decl/hierarchy/outfit/job/bearcat/crew
@@ -26,6 +26,8 @@
l_ear = /obj/item/device/radio/headset/map_preset/bearcat
r_ear = null
+ backpack_contents = list(/obj/item/crowbar/prybar = 1)
+
/decl/hierarchy/outfit/job/bearcat/crew
name = BEARCAT_OUTFIT_JOB_NAME("Crew")
id_types = list(/obj/item/card/id/bearcat)
@@ -37,20 +39,10 @@
pda_type = /obj/item/modular_computer/pda/captain
id_types = list(/obj/item/card/id/bearcat_captain)
-/decl/hierarchy/outfit/job/bearcat/captain/post_equip(var/mob/living/carbon/human/H)
- ..()
- var/obj/item/clothing/uniform = H.w_uniform
- if(uniform)
- var/obj/item/clothing/accessory/toggleable/hawaii/random/eyegore = new()
- if(uniform.can_attach_accessory(eyegore))
- uniform.attach_accessory(null, eyegore)
- else
- qdel(eyegore)
-
#undef BEARCAT_OUTFIT_JOB_NAME
/obj/effect/submap_landmark/spawnpoint/captain
- name = "Independant Captain"
+ name = "Independent Captain"
/obj/effect/submap_landmark/spawnpoint/crewman
- name = "Independant Crewman"
+ name = "Independent Crewman"
diff --git a/maps/away/bearcat/bearcat_objects.dm b/maps/away/bearcat/bearcat_objects.dm
new file mode 100644
index 00000000000..da442913747
--- /dev/null
+++ b/maps/away/bearcat/bearcat_objects.dm
@@ -0,0 +1,82 @@
+#define CATASTROPHE_FISH 1
+#define CATASTROPHE_INFESTATION 2
+
+// Randomized problem with the ship
+// Selects one at round-start and applies throughout the ship at landmarks
+/obj/effect/landmark/bearcat_catastrophe
+ delete_me = TRUE
+ var/global/catastrophe_type = 0
+
+/obj/effect/landmark/bearcat_catastrophe/New()
+ if(!catastrophe_type)
+ catastrophe_type = rand(CATASTROPHE_FISH, CATASTROPHE_INFESTATION)
+ return ..()
+
+// Spawns the normal enemies, if applicable
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn
+ name = "Bearcat - Generic Enemy Spawn"
+
+/obj/effect/landmark/bearcat_catastrophe/generic_spawn/Initialize()
+ switch(catastrophe_type)
+ if(CATASTROPHE_FISH)
+ new /mob/living/simple_animal/hostile/carp(loc)
+ if(CATASTROPHE_INFESTATION)
+ var/mob_type = pick(/mob/living/simple_animal/hostile/infestation/broodling, /mob/living/simple_animal/hostile/infestation/floatfly)
+ new mob_type(loc)
+
+ return ..()
+
+#undef CATASTROPHE_FISH
+#undef CATASTROPHE_INFESTATION
+
+/obj/effect/landmark/corpse/bearcat_captain
+ name = "Bearcat Captain"
+ corpse_outfits = list(/decl/hierarchy/outfit/deadcap)
+
+/obj/effect/landmark/corpse/bearcat_captain/AdditionalEffects(mob/living/carbon/human/H)
+ . = ..()
+ var/obj/structure/bed/chair/C = locate() in loc
+ if(C)
+ C.buckle_mob(H)
+
+/decl/hierarchy/outfit/deadcap
+ name = "Derelict Captain"
+ uniform = /obj/item/clothing/under/casual_pants/classicjeans
+ suit = /obj/item/clothing/suit/storage/hooded/wintercoat
+ shoes = /obj/item/clothing/shoes/black
+ r_pocket = /obj/item/device/radio/map_preset/bearcat
+
+/obj/machinery/power/apc/derelict
+ cell_type = /obj/item/cell/crap/empty
+ locked = 0
+ coverlocked = 0
+
+/obj/item/card/id/bearcat
+ access = list(access_bearcat)
+
+/obj/item/card/id/bearcat_captain
+ access = list(access_bearcat, access_bearcat_captain)
+
+/obj/structure/closet/secure_closet/engineering_electrical/bearcat
+ req_access = list(access_bearcat)
+
+/obj/structure/closet/secure_closet/engineering_welding/bearcat
+ req_access = list(access_bearcat)
+
+/obj/structure/closet/secure_closet/freezer/fridge/bearcat
+ req_access = list(access_bearcat)
+
+/obj/structure/closet/secure_closet/freezer/meat/bearcat
+ req_access = list(access_bearcat)
+
+/obj/machinery/vending/engineering/bearcat
+ req_access = list(access_bearcat)
+
+/obj/machinery/vending/tool/bearcat
+ req_access = list(access_bearcat)
+
+/obj/machinery/suit_storage_unit/engineering/salvage/bearcat
+ req_access = list(access_bearcat)
+
+/obj/machinery/suit_cycler/salvage/bearcat
+ req_access = list(access_bearcat)
diff --git a/maps/away/casino/casino.dm b/maps/away/casino/casino.dm
index 111fd738e44..d0a3d8b302c 100644
--- a/maps/away/casino/casino.dm
+++ b/maps/away/casino/casino.dm
@@ -1,4 +1,5 @@
#include "casino_areas.dm"
+#include "casino_objects.dm"
#include "../mining/mining_areas.dm"
/obj/effect/overmap/visitable/ship/casino
@@ -69,87 +70,3 @@
fuel_consumption = 0.5//it's small
range = 1
defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/nav_casino/cutter_hangar
- name = "Casino Hangar"
- landmark_tag = "nav_casino_hangar"
- base_area = /area/casino/casino_hangar
- base_turf = /turf/simulated/floor/plating
-
-/obj/effect/shuttle_landmark/nav_casino/cutter_transit
- name = "In transit"
- landmark_tag = "nav_casino_transit"
-
-/obj/machinery/computer/shuttle_control/explore/casino_cutter
- name = "cutter control console"
- shuttle_tag = "Casino Cutter"
-
-/obj/structure/casino/roulette
- name = "roulette"
- desc = "Spin the roulette to try your luck."
- icon = 'maps/away/casino/casino_sprites.dmi'
- icon_state = "roulette_r"
- density = FALSE
- anchored = TRUE
- var/busy=0
-
-/obj/structure/casino/roulette/attack_hand(mob/user as mob)
- if (busy)
- to_chat(user,"You cannot spin now! \The [src] is already spinning. ")
- return
- visible_message("\ [user] spins the roulette and throws inside little ball.")
- busy = 1
- var/n = rand(0,36)
- var/color = "green"
- add_fingerprint(user)
- if ((n>0 && n<11) || (n>18 && n<29))
- if (n%2)
- color="red"
- else
- color="black"
- if ( (n>10 && n<19) || (n>28) )
- if (n%2)
- color="black"
- else
- color="red"
- spawn(5 SECONDS)
- visible_message("\The [src] stops spinning, the ball landing on [n], [color].")
- busy=0
-
-/obj/structure/casino/roulette_chart
- name = "roulette chart"
- desc = "Roulette chart. Place your bets! "
- icon = 'maps/away/casino/casino_sprites.dmi'
- icon_state = "roulette_l"
- density = FALSE
- anchored = TRUE
-
-/obj/structure/casino/bj_table
- name = "blackjack table"
- desc = "This is a blackjack table. "
- icon = 'maps/away/casino/casino_sprites.dmi'
- icon_state = "bj_left"
- density = FALSE
- anchored = TRUE
-
-/obj/structure/casino/bj_table/bj_right
- icon_state = "bj_right"
-
-/obj/structure/casino/oh_bandit
- name = "one armed bandit"
- desc = "Turned off slot machine. "
- icon = 'maps/away/casino/casino_sprites.dmi'
- icon_state = "slot_machine"
- density = FALSE
- anchored = TRUE
-
-/obj/structure/casino/craps
- name = "craps table"
- desc = "Craps table: roll dice!"
- icon = 'maps/away/casino/casino_sprites.dmi'
- icon_state = "craps_top"
- density = FALSE
- anchored = TRUE
-
-/obj/structure/casino/craps/craps_down
- icon_state = "craps_down"
diff --git a/maps/away/casino/casino.dmm b/maps/away/casino/casino.dmm
index 3cd4ee84ed3..c579818e4e0 100644
--- a/maps/away/casino/casino.dmm
+++ b/maps/away/casino/casino.dmm
@@ -186,9 +186,8 @@
"aD" = (
/obj/machinery/door/airlock/external{
frequency = 1380;
- icon_state = "door_closed";
+ icon_state = "preview";
id_tag = "casino_dock_outer";
- locked = 0;
name = "Docking Port Airlock"
},
/turf/simulated/floor/plating,
@@ -285,9 +284,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/airlock/external{
frequency = 1380;
- icon_state = "door_closed";
+ icon_state = "preview";
id_tag = "casino_dock_inner";
- locked = 0;
name = "Docking Port Airlock"
},
/turf/simulated/floor/plating,
@@ -391,7 +389,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/casino/casino_bridge)
"bf" = (
/obj/machinery/door/firedoor,
@@ -399,7 +397,7 @@
name = "Casino Bridge"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/casino/casino_bridge)
"bh" = (
/turf/simulated/floor/tiled/dark,
@@ -421,13 +419,13 @@
pixel_y = 2
},
/obj/item/gun/projectile/pistol/sec/MK,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bk" = (
/obj/machinery/door/blast/regular{
id_tag = "casino_weaponry"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -436,25 +434,25 @@
d2 = 4;
icon_state = "1-4"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
icon_state = "6-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bn" = (
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bo" = (
/obj/machinery/floodlight,
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
@@ -473,13 +471,13 @@
"bu" = (
/obj/structure/table/rack,
/obj/item/material/knife/combat,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -488,7 +486,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bz" = (
/obj/structure/cable{
@@ -503,7 +502,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bA" = (
/obj/item/trash/cigbutt/professionals{
@@ -522,7 +522,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bB" = (
/obj/item/trash/cigbutt/professionals,
@@ -538,7 +539,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bC" = (
/obj/machinery/light/small{
@@ -556,7 +558,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bD" = (
/obj/item/material/shard,
@@ -570,7 +573,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bE" = (
/obj/effect/decal/cleanable/blood/drip,
@@ -587,7 +591,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bF" = (
/obj/effect/decal/cleanable/blood/drip,
@@ -603,7 +608,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bG" = (
/obj/machinery/door/airlock{
@@ -622,7 +627,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bI" = (
/obj/structure/fireaxecabinet{
@@ -640,7 +645,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bJ" = (
/obj/machinery/light{
@@ -655,7 +663,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bK" = (
/obj/structure/reagent_dispensers/peppertank{
@@ -667,7 +678,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -679,7 +693,10 @@
/obj/machinery/alarm{
pixel_y = 25
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bM" = (
/obj/machinery/door/airlock{
@@ -693,7 +710,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -702,7 +719,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bO" = (
/obj/machinery/light{
@@ -714,7 +732,8 @@
dir = 8;
level = 2
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bP" = (
/obj/machinery/button/blast_door{
@@ -730,17 +749,20 @@
pixel_y = 25
},
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bQ" = (
/obj/structure/bed/chair,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bR" = (
/obj/machinery/alarm{
pixel_y = 25
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"bS" = (
/obj/machinery/portable_atmospherics/canister/air,
@@ -754,14 +776,17 @@
"bU" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/shotgun/pump/combat,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bV" = (
/obj/random/trash,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bW" = (
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"bZ" = (
/turf/simulated/wall,
@@ -773,19 +798,22 @@
/turf/simulated/wall/r_wall,
/area/casino/casino_crew_bunk)
"cc" = (
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cd" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"ce" = (
/obj/structure/cable{
icon_state = "4-9"
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cf" = (
/obj/structure/cable{
@@ -798,32 +826,40 @@
name = "east bump";
pixel_x = 24
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cg" = (
/obj/structure/table/rack,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"ch" = (
/obj/structure/table/rack,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"ci" = (
/obj/structure/table/steel_reinforced,
/obj/item/wrench,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cj" = (
/obj/structure/table/steel_reinforced,
/obj/item/device/radio,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"ck" = (
/obj/structure/table/steel_reinforced,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cl" = (
/obj/machinery/atmospherics/binary/pump/high_power,
@@ -857,12 +893,18 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"cr" = (
/obj/structure/bed,
/obj/random/plushie,
/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 9
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cs" = (
@@ -875,6 +917,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"ct" = (
@@ -889,6 +934,9 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cu" = (
@@ -903,6 +951,9 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cv" = (
@@ -914,6 +965,9 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cw" = (
@@ -926,6 +980,9 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cx" = (
@@ -940,6 +997,9 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cy" = (
@@ -953,6 +1013,9 @@
name = "east bump";
pixel_x = 24
},
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 5
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cz" = (
@@ -963,23 +1026,26 @@
level = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cA" = (
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cB" = (
/obj/structure/table/steel_reinforced,
/obj/item/device/radio,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cC" = (
/obj/machinery/computer/modular{
dir = 8;
name = "Gambling console"
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cD" = (
/obj/effect/wallframe_spawn/reinforced,
@@ -1042,6 +1108,9 @@
"cL" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cM" = (
@@ -1061,6 +1130,9 @@
/area/casino/casino_crew_bunk)
"cP" = (
/obj/structure/closet/emcloset,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"cQ" = (
@@ -1069,7 +1141,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cS" = (
/obj/structure/bed/chair{
@@ -1077,7 +1149,7 @@
icon_state = "chair_preview"
},
/obj/effect/decal/cleanable/blood,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cT" = (
/obj/machinery/light{
@@ -1089,7 +1161,10 @@
icon_state = "console";
name = "Cameras console"
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"cU" = (
/obj/effect/floor_decal/industrial/warning,
@@ -1159,6 +1234,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"dd" = (
@@ -1167,27 +1243,32 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"de" = (
/obj/machinery/light,
/obj/structure/bed,
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"df" = (
/obj/structure/closet,
/obj/random/junk,
/obj/random/smokes,
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"dg" = (
/obj/structure/bed,
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"dh" = (
/obj/structure/bed,
/obj/random/plushie,
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"di" = (
@@ -1195,20 +1276,24 @@
/obj/structure/closet,
/obj/random/action_figure,
/obj/random/shoes,
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"dj" = (
/obj/machinery/vending/security{
req_access = list()
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dm" = (
/obj/machinery/computer/modular{
dir = 8;
name = "Security console"
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dn" = (
/obj/effect/floor_decal/industrial/warning{
@@ -1216,6 +1301,11 @@
},
/turf/simulated/floor/tiled,
/area/casino/casino_hangar)
+"dp" = (
+/obj/random/cash,
+/obj/effect/landmark/casino_catastrophe/normal_enemy,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
"dr" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8;
@@ -1258,34 +1348,43 @@
/area/casino/casino_storage)
"dz" = (
/obj/random/ammo,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dA" = (
/obj/structure/table/rack,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dB" = (
/obj/structure/table/rack,
/obj/item/storage/box/ammo/shotgunammo,
/obj/item/storage/box/ammo/shotgunammo,
/obj/item/storage/box/ammo/shotgunammo,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dC" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/armor/bulletproof/vest,
/obj/item/clothing/suit/armor/bulletproof/vest,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dD" = (
/obj/structure/table/rack,
/obj/random/voidsuit,
/obj/random/voidhelmet,
/obj/item/tank/air,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"dE" = (
/obj/effect/floor_decal/industrial/warning{
@@ -1308,21 +1407,33 @@
/obj/structure/bed/chair/comfy/red{
dir = 8
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dN" = (
/obj/structure/table/gamblingtable,
/obj/structure/casino/bj_table,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dO" = (
/obj/structure/table/gamblingtable,
/obj/structure/casino/bj_table/bj_right,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dP" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dQ" = (
/obj/structure/table/woodentable,
@@ -1342,26 +1453,41 @@
pixel_y = 5
},
/obj/random/tool,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dR" = (
/obj/structure/bed/chair,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dS" = (
/obj/structure/table/woodentable,
/obj/item/storage/toolbox/mechanical,
/obj/item/stack/cable_coil,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dT" = (
/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"dU" = (
/obj/item/clothing/suit/armor/bulletproof/vest,
/obj/random/ammo,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"eb" = (
/obj/effect/overmap/visitable/ship/casino,
@@ -1409,7 +1535,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eh" = (
/obj/structure/table/gamblingtable,
@@ -1419,26 +1548,32 @@
icon_state = "tube1";
pixel_y = 0
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ei" = (
/obj/structure/table/gamblingtable,
/obj/structure/casino/roulette,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ej" = (
/obj/item/stock_parts/circuitboard/broken,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ek" = (
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"el" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"em" = (
/obj/random/ammo,
@@ -1446,11 +1581,14 @@
dir = 4;
icon_state = "tube1"
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"en" = (
/obj/structure/safe,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/shuttle/black,
/area/casino/casino_security)
"eq" = (
/obj/structure/cable/yellow{
@@ -1542,49 +1680,55 @@
/area/space)
"ew" = (
/obj/structure/reagent_dispensers/beerkeg,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ex" = (
/obj/structure/casino/oh_bandit,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ey" = (
/obj/structure/bed/chair,
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"ez" = (
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eA" = (
/obj/item/device/multitool,
/obj/item/wirecutters,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"eB" = (
/obj/machinery/door/airlock/highsecurity{
name = "Safe area"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/shuttle/black,
/area/casino/casino_security)
"eC" = (
/obj/random/coin,
/obj/random/cash,
/obj/random/ammo,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/shuttle/black,
/area/casino/casino_security)
"eD" = (
/obj/random/coin,
/obj/random/ammo,
/obj/random/ammo,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/shuttle/black,
/area/casino/casino_security)
"eE" = (
/obj/random/coin,
/obj/random/coin,
/obj/item/storage/bag/cash,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/shuttle/black,
/area/casino/casino_security)
"eF" = (
/obj/machinery/light{
@@ -1624,24 +1768,36 @@
/area/space)
"eJ" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eK" = (
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eL" = (
/obj/machinery/vending/assist,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eM" = (
/obj/machinery/vending/engineering{
req_access = list()
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eN" = (
/obj/machinery/light/small{
@@ -1654,27 +1810,34 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"eO" = (
/obj/machinery/constructable_frame/machine_frame,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eP" = (
/obj/machinery/light,
/obj/machinery/vending/tool,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eQ" = (
/obj/structure/table/steel_reinforced,
/obj/random/tech_supply,
/obj/random/tech_supply,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eR" = (
/obj/structure/table/steel_reinforced,
/obj/item/storage/toolbox/electrical,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eS" = (
/obj/structure/table/steel_reinforced,
@@ -1683,7 +1846,8 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eT" = (
/obj/structure/table/steel_reinforced,
@@ -1695,7 +1859,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eU" = (
/obj/effect/decal/cleanable/blood/splatter,
@@ -1715,12 +1880,18 @@
name = "east bump";
pixel_x = 24
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_storage)
"eV" = (
/obj/random/cash,
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"eW" = (
/obj/structure/cable{
@@ -1779,11 +1950,14 @@
/area/casino/casino_hangar)
"fc" = (
/obj/machinery/floodlight,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fd" = (
/obj/structure/reagent_dispensers/beerkeg,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fe" = (
/obj/structure/cable{
@@ -1799,12 +1973,15 @@
name = "east bump";
pixel_x = 24
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"ff" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
- name = "Kitchen"
+ name = "Storage"
},
/obj/effect/decal/cleanable/blood/splatter,
/obj/structure/cable{
@@ -1814,7 +1991,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fg" = (
/obj/machinery/door/airlock{
@@ -1822,7 +1999,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"fh" = (
/obj/machinery/door/firedoor,
@@ -1846,7 +2023,10 @@
/area/casino/casino_security)
"fi" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1855,7 +2035,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fk" = (
/obj/random/trash,
@@ -1868,7 +2048,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fo" = (
/obj/machinery/door/airlock{
@@ -1884,7 +2064,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fq" = (
/obj/random/coin,
@@ -1993,7 +2173,10 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fC" = (
/obj/structure/cable{
@@ -2001,11 +2184,14 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fD" = (
/obj/structure/closet/emcloset,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fE" = (
/obj/machinery/door/firedoor,
@@ -2043,6 +2229,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_security)
"fI" = (
@@ -2081,15 +2268,22 @@
"fN" = (
/obj/structure/mopbucket,
/obj/item/mop,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fO" = (
/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fP" = (
/obj/structure/closet/crate/trashcart,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/bordercorner{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"fQ" = (
/turf/simulated/wall,
@@ -2102,6 +2296,7 @@
name = "west bump";
pixel_x = -24
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fS" = (
@@ -2109,6 +2304,7 @@
name = "plastic table frame"
},
/obj/item/material/kitchen/utensil/fork,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fT" = (
@@ -2119,6 +2315,7 @@
name = "plastic table frame"
},
/obj/item/trash/plate,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fU" = (
@@ -2126,6 +2323,7 @@
name = "plastic table frame"
},
/obj/random/snack,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fV" = (
@@ -2133,6 +2331,7 @@
name = "plastic table frame"
},
/obj/item/reagent_containers/food/drinks/small_milk,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fW" = (
@@ -2140,6 +2339,7 @@
name = "plastic table frame"
},
/obj/item/trash/cigbutt/professionals,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fX" = (
@@ -2149,6 +2349,7 @@
/obj/item/trash/plate,
/obj/random/snack,
/obj/random/snack,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fY" = (
@@ -2159,10 +2360,12 @@
name = "plastic table frame"
},
/obj/random/snack,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"fZ" = (
/obj/structure/closet/emcloset,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"ga" = (
@@ -2184,6 +2387,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gd" = (
@@ -2219,7 +2423,10 @@
/obj/random/material,
/obj/random/material,
/obj/random/material,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"gi" = (
/obj/structure/table/rack{
@@ -2228,9 +2435,13 @@
/obj/random/tech_supply,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"gj" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gk" = (
@@ -2238,12 +2449,14 @@
dir = 1
},
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gl" = (
/obj/structure/bed/chair{
dir = 1
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gm" = (
@@ -2251,6 +2464,7 @@
dir = 1
},
/obj/item/reagent_containers/food/drinks/flask/shiny,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gn" = (
@@ -2258,10 +2472,12 @@
dir = 1
},
/obj/random/snack,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gp" = (
/obj/random/ammo,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gq" = (
@@ -2280,6 +2496,7 @@
/obj/structure/fireaxecabinet{
pixel_y = 30
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gr" = (
@@ -2296,6 +2513,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gs" = (
@@ -2305,6 +2523,7 @@
id_tag = "casino_main";
name = "Main floor Blast Doors"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gt" = (
@@ -2362,7 +2581,7 @@
"gy" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
+ icon_state = "preview";
id_tag = "solar_casino_outer";
locked = 1;
name = "External Access"
@@ -2413,38 +2632,46 @@
},
/obj/item/stack/cable_coil,
/obj/random/material,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"gB" = (
/obj/effect/decal/cleanable/generic,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"gC" = (
/obj/structure/table/rack{
dir = 8
},
/obj/random/tech_supply,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"gD" = (
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gE" = (
/obj/item/trash/cigbutt/menthol,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"gG" = (
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gH" = (
/obj/random/coin,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gI" = (
/obj/structure/bed/chair{
dir = 4
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gJ" = (
@@ -2466,7 +2693,7 @@
"gL" = (
/obj/machinery/door/airlock/external{
frequency = 1439;
- icon_state = "door_locked";
+ icon_state = "preview";
id_tag = "solar_casino_inner";
locked = 1;
name = "External Access"
@@ -2484,10 +2711,12 @@
/area/casino/casino_solar_control)
"gX" = (
/obj/structure/bed/chair,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gY" = (
/obj/random/cash,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"gZ" = (
@@ -2553,17 +2782,22 @@
},
/obj/random/tech_supply,
/obj/item/stack/cable_coil,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"hf" = (
/obj/machinery/door/window/southleft,
/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"hg" = (
/obj/machinery/door/firedoor,
/obj/structure/table/marble,
/obj/structure/flora/pottedplant/unusual,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"hi" = (
@@ -2628,6 +2862,7 @@
/obj/structure/hygiene/sink/kitchen{
pixel_y = 30
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hq" = (
@@ -2635,31 +2870,38 @@
/obj/machinery/light{
dir = 1
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hr" = (
/obj/machinery/cooker/candy,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hs" = (
/obj/machinery/cooker/fryer,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"ht" = (
/obj/machinery/cooker/oven,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hu" = (
/obj/machinery/cooker/grill,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hv" = (
/obj/machinery/light{
dir = 1
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hw" = (
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hx" = (
@@ -2726,19 +2968,25 @@
/obj/structure/table/rack{
dir = 8
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"hJ" = (
/obj/random/trash,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hK" = (
/obj/effect/decal/cleanable/flour,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hL" = (
/obj/structure/table/marble,
/obj/machinery/microwave,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hM" = (
@@ -2785,7 +3033,7 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"hS" = (
/obj/machinery/light/small,
@@ -2801,7 +3049,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"hT" = (
/obj/machinery/door/firedoor,
@@ -2824,16 +3072,19 @@
/area/casino/casino_kitchen)
"hV" = (
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hW" = (
/obj/effect/decal/cleanable/egg_smudge,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hX" = (
/obj/structure/table/marble,
/obj/machinery/reagentgrinder/juicer,
/obj/item/reagent_containers/glass/beaker/large,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"hY" = (
@@ -2939,6 +3190,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"il" = (
@@ -2955,6 +3207,7 @@
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"im" = (
@@ -2964,11 +3217,13 @@
},
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/snacks/sliceable/bread,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"in" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/reagent_containers/food/condiment/flour,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"io" = (
@@ -2978,6 +3233,7 @@
icon_state = "tube1"
},
/obj/machinery/chem_master/condimaster,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"ip" = (
@@ -3087,6 +3343,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"iC" = (
@@ -3126,10 +3383,12 @@
/area/casino/casino_kitchen)
"iF" = (
/obj/machinery/vending/dinnerware,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"iG" = (
/obj/machinery/stove,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"iH" = (
@@ -3194,6 +3453,7 @@
/area/casino/casino_kitchen)
"iP" = (
/obj/effect/decal/cleanable/pie_smudge,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"iQ" = (
@@ -3335,6 +3595,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
/turf/simulated/floor/plating,
/area/casino/casino_crew_atmos)
"jk" = (
@@ -3349,6 +3610,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jl" = (
@@ -3374,6 +3636,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jn" = (
@@ -3383,6 +3646,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jo" = (
@@ -3405,6 +3669,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jq" = (
@@ -3415,24 +3680,28 @@
dir = 8;
level = 2
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jr" = (
/obj/machinery/light{
dir = 1
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"js" = (
/obj/machinery/alarm{
pixel_y = 25
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jt" = (
/obj/machinery/vending/boozeomat{
req_access = list()
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"ju" = (
@@ -3512,10 +3781,12 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jD" = (
/obj/machinery/vending/coffee,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jE" = (
@@ -3534,21 +3805,25 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jF" = (
/obj/structure/table/marble,
/obj/machinery/chemical_dispenser/bar_alc/full,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jG" = (
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jH" = (
/obj/structure/table/marble,
/obj/item/material/ashtray/bronze,
/obj/item/flame/lighter/zippo/random,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jI" = (
@@ -3613,6 +3888,7 @@
/obj/item/storage/box/glasses/pint,
/obj/item/storage/box/glasses/wine,
/obj/item/device/radio,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"jR" = (
@@ -3624,16 +3900,19 @@
/obj/item/reagent_containers/food/drinks/bottle/vodka{
pixel_x = 10
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jS" = (
/obj/structure/table/marble,
/obj/machinery/chemical_dispenser/bar_soft/full,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jT" = (
/obj/structure/table/marble,
/obj/random/coin,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"jU" = (
@@ -3710,10 +3989,12 @@
/obj/random/drinkbottle,
/obj/random/drinkbottle,
/obj/random/drinkbottle,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"ke" = (
/obj/structure/reagent_dispensers/beerkeg,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"kf" = (
@@ -3724,15 +4005,18 @@
/obj/random/drinkbottle,
/obj/random/drinkbottle,
/obj/random/drinkbottle,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kg" = (
/obj/item/trash/cigbutt/professionals,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kh" = (
/obj/structure/table/marble,
/obj/item/reagent_containers/food/drinks/bottle/cognac,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"ki" = (
@@ -3785,6 +4069,7 @@
"ko" = (
/obj/structure/table/marble,
/obj/item/reagent_containers/food/drinks/h_chocolate,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kp" = (
@@ -3792,20 +4077,24 @@
/obj/item/storage/fancy/cigar{
pixel_y = 5
},
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kq" = (
/obj/structure/table/marble,
/obj/random/smokes,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kr" = (
/obj/structure/table/marble,
/obj/random/loot,
+/obj/effect/floor_decal/corner/pink/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"ks" = (
/obj/structure/table/marble,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"kt" = (
@@ -3952,6 +4241,13 @@
},
/turf/simulated/floor/carpet/brown,
/area/casino/casino_mainfloor)
+"kK" = (
+/obj/structure/bed/chair/office/light,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_storage)
"kN" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -3966,6 +4262,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/landmark/casino_catastrophe/normal_enemy,
/turf/simulated/floor/carpet/brown,
/area/casino/casino_mainfloor)
"kO" = (
@@ -4712,6 +5009,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
/turf/simulated/floor/plating,
/area/casino/casino_bow)
"mJ" = (
@@ -4837,7 +5135,7 @@
"na" = (
/obj/machinery/door/airlock/external{
frequency = 1380;
- icon_state = "door_locked";
+ icon_state = "preview";
id_tag = "escape_pod";
locked = 1;
name = "Escape Pod"
@@ -4963,6 +5261,16 @@
"ns" = (
/turf/simulated/floor/reinforced/airless,
/area/casino/casino_bow)
+"nJ" = (
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_storage)
+"nP" = (
+/obj/effect/floor_decal/corner/pink/diagonal,
+/turf/simulated/floor/tiled,
+/area/casino/casino_kitchen)
"ob" = (
/obj/structure/table/gamblingtable,
/obj/structure/casino/roulette_chart,
@@ -4985,6 +5293,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
"pb" = (
@@ -5002,8 +5311,22 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
+"pq" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"qb" = (
/obj/item/ammo_casing/rifle/used,
/obj/item/ammo_casing/rifle/used,
@@ -5026,8 +5349,24 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
+"qN" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"rb" = (
/obj/item/ammo_casing/rifle/used,
/obj/item/ammo_casing/rifle/used,
@@ -5050,6 +5389,7 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"sb" = (
@@ -5070,8 +5410,14 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
+"sx" = (
+/obj/structure/table/woodentable,
+/obj/effect/landmark/casino_catastrophe/strong_enemy,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
"tb" = (
/obj/item/ammo_casing/rifle/used,
/turf/simulated/floor/tiled,
@@ -5084,6 +5430,7 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"ub" = (
@@ -5107,8 +5454,32 @@
icon_state = "4-8";
pixel_x = 0
},
-/turf/simulated/floor/tiled,
-/area/casino/casino_crew_cantina)
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled,
+/area/casino/casino_crew_cantina)
+"ux" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
+"uz" = (
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/plating,
+/area/casino/casino_crew_atmos)
"uL" = (
/obj/effect/wallframe_spawn/reinforced/titanium,
/turf/simulated/floor/plating,
@@ -5130,8 +5501,13 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
+"vW" = (
+/obj/effect/floor_decal/corner/pink/diagonal,
+/turf/simulated/floor/tiled,
+/area/casino/casino_mainfloor)
"wb" = (
/obj/item/ammo_casing/rifle/used,
/obj/item/ammo_casing/rifle/used,
@@ -5155,6 +5531,7 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"xb" = (
@@ -5173,7 +5550,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"xc" = (
/obj/machinery/vending/cigarette,
@@ -5183,6 +5563,7 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"xu" = (
@@ -5196,12 +5577,14 @@
dir = 1
},
/obj/item/storage/bag/cash,
+/obj/effect/landmark/casino_catastrophe/strong_enemy,
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
"yb" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/ammo_casing/pistol/magnum/used,
-/turf/simulated/floor/tiled,
+/obj/effect/landmark/casino_catastrophe/normal_enemy,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"yc" = (
/obj/structure/cable{
@@ -5210,6 +5593,7 @@
icon_state = "4-8";
pixel_x = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
"zb" = (
@@ -5224,6 +5608,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/floor_decal/corner/orange/border,
/turf/simulated/floor/tiled,
/area/casino/casino_crew_bunk)
"zc" = (
@@ -5245,13 +5630,20 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/random/cash,
+/obj/random/cash,
+/obj/random/cash,
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
+"zU" = (
+/obj/effect/landmark/casino_catastrophe/normal_enemy,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
"Ab" = (
/obj/item/gun/projectile/pistol/sec/MK,
/obj/item/ammo_casing/pistol/magnum/used,
/obj/item/ammo_casing/pistol/magnum/used,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"Ac" = (
/obj/structure/cable{
@@ -5259,8 +5651,14 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
+"AK" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/tiled,
+/area/casino/casino_crew_bunk)
"AT" = (
/obj/effect/shuttle_landmark/nav_casino/cutter_hangar,
/obj/structure/cable/green{
@@ -5276,7 +5674,7 @@
"Bb" = (
/obj/item/material/shard,
/obj/item/ammo_casing/pistol/magnum/used,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_security)
"Bc" = (
/obj/machinery/door/firedoor,
@@ -5290,6 +5688,13 @@
},
/turf/simulated/floor/tiled,
/area/casino/casino_crew_cantina)
+"Be" = (
+/obj/structure/casino/oh_bandit,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_storage)
"Cb" = (
/obj/item/ammo_casing/rifle/used,
/obj/item/ammo_casing/rifle/used,
@@ -5303,6 +5708,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
"Db" = (
@@ -5316,7 +5722,10 @@
/obj/item/ammo_casing/rifle/used,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Dc" = (
/obj/structure/cable{
@@ -5332,8 +5741,16 @@
pixel_x = -24
},
/obj/structure/cable,
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
+"Dp" = (
+/obj/effect/landmark/casino_catastrophe/strong_enemy,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
+"DE" = (
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_security)
"Eb" = (
/obj/effect/decal/cleanable/blood,
/obj/item/gun/projectile/pistol/magnum_pistol,
@@ -5352,6 +5769,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_security)
"Ec" = (
@@ -5361,6 +5779,24 @@
},
/turf/simulated/floor/carpet/brown,
/area/casino/casino_mainfloor)
+"EO" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"Fb" = (
/obj/structure/bed/chair{
dir = 4;
@@ -5382,11 +5818,16 @@
name = "Casino Checkpoint Blast Door contol";
pixel_y = -25
},
+/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_security)
"Fc" = (
/turf/simulated/wall/r_wall,
/area/casino/casino_mainfloor)
+"Ff" = (
+/obj/structure/bed/chair,
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_storage)
"FM" = (
/obj/item/storage/backpack/dufflebag,
/obj/random/cash,
@@ -5397,8 +5838,19 @@
/obj/structure/bed/chair/comfy/captain{
dir = 1
},
+/obj/random/cash,
+/obj/random/cash,
+/obj/random/cash,
+/obj/random/cash,
+/obj/random/cash,
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
+"FZ" = (
+/obj/effect/floor_decal/corner/yellow/bordercorner{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"Gb" = (
/obj/item/ammo_casing/pistol/magnum/used,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -5406,6 +5858,7 @@
level = 2
},
/obj/structure/flora/pottedplant/unusual,
+/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_security)
"Gc" = (
@@ -5425,8 +5878,16 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_kitchen)
+"Gi" = (
+/obj/structure/sign/warning/pods{
+ pixel_y = -30
+ },
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/plating,
+/area/casino/casino_bow)
"Hb" = (
/obj/item/ammo_casing/rifle/used,
/turf/simulated/floor/carpet/brown,
@@ -5449,6 +5910,19 @@
},
/turf/simulated/floor/plating,
/area/casino/casino_crew_atmos)
+"HM" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner/yellow/bordercorner{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"Ic" = (
/obj/structure/flora/pottedplant,
/obj/machinery/light{
@@ -5461,6 +5935,7 @@
/obj/structure/bed/chair/comfy/captain{
dir = 1
},
+/obj/random/cash,
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
"In" = (
@@ -5472,6 +5947,18 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
+"Ip" = (
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
+"IY" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8;
+ icon_state = "warning"
+ },
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/tiled,
+/area/casino/casino_hangar)
"Jb" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Solar - Starboard";
@@ -5615,7 +6102,7 @@
/obj/structure/cable{
icon_state = "4-9"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Oc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5643,6 +6130,16 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
+"OZ" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/dark,
+/area/casino/casino_maintenance)
"Pb" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -5659,7 +6156,8 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/bordercorner,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Pc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5681,12 +6179,20 @@
dir = 1;
icon_state = "tube1"
},
+/obj/random/cash,
+/obj/random/cash,
+/obj/random/cash,
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
"PI" = (
/obj/machinery/radio_beacon,
/turf/simulated/floor/tiled,
/area/casino/casino_bridge)
+"PO" = (
+/obj/random/cash,
+/obj/random/cash,
+/turf/simulated/floor/tiled/steel_grid,
+/area/casino/casino_cutter)
"Qb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5695,7 +6201,10 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Qc" = (
/obj/effect/decal/cleanable/blood/splatter,
@@ -5744,7 +6253,10 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Rc" = (
/obj/structure/cable{
@@ -5758,6 +6270,12 @@
},
/turf/simulated/floor/plating,
/area/casino/casino_bow)
+"RG" = (
+/obj/machinery/door/firedoor,
+/obj/structure/table/marble,
+/obj/effect/floor_decal/corner/white/diagonal,
+/turf/simulated/floor/tiled,
+/area/casino/casino_mainfloor)
"Sb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -5775,7 +6293,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Sc" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -5801,6 +6319,10 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/casino/casino_cutter)
+"SY" = (
+/obj/effect/landmark/casino_catastrophe/normal_enemy,
+/turf/simulated/floor/tiled,
+/area/casino/casino_hangar)
"Tc" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 6
@@ -5810,6 +6332,10 @@
},
/turf/simulated/floor/airless,
/area/casino/casino_bow)
+"TZ" = (
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/tiled,
+/area/casino/casino_hangar)
"Uc" = (
/obj/structure/hygiene/sink{
dir = 8;
@@ -5828,6 +6354,23 @@
},
/turf/simulated/floor/tiled/white,
/area/casino/casino_crew_bathroom)
+"Um" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/plating,
+/area/casino/casino_bow)
+"Uo" = (
+/obj/structure/bed,
+/obj/effect/floor_decal/corner/orange/border{
+ dir = 6
+ },
+/turf/simulated/floor/tiled,
+/area/casino/casino_crew_bunk)
"Vb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -5842,7 +6385,10 @@
icon_state = "4-8";
pixel_x = 0
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/bordercorner{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Vc" = (
/obj/structure/hygiene/sink{
@@ -5867,6 +6413,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/casino/casino_patron_bathroom)
+"Vn" = (
+/obj/random/loot,
+/obj/effect/landmark/casino_catastrophe/central_danger,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
"Vu" = (
/obj/structure/fuel_port,
/turf/simulated/wall/r_titanium,
@@ -5889,7 +6440,10 @@
d2 = 8;
icon_state = "2-8"
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
"Wc" = (
/obj/structure/hygiene/sink{
@@ -5906,6 +6460,11 @@
},
/turf/simulated/floor/tiled/white,
/area/casino/casino_patron_bathroom)
+"WF" = (
+/obj/structure/table/marble,
+/obj/effect/floor_decal/corner/pink/diagonal,
+/turf/simulated/floor/tiled,
+/area/casino/casino_mainfloor)
"Xb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -5920,8 +6479,12 @@
d2 = 8;
icon_state = "1-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/dark,
/area/casino/casino_maintenance)
+"XX" = (
+/obj/effect/landmark/casino_catastrophe/weak_enemy,
+/turf/simulated/floor/carpet/brown,
+/area/casino/casino_mainfloor)
"Yb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -5963,6 +6526,7 @@
icon_state = "0-2";
pixel_y = 1
},
+/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled,
/area/casino/casino_mainfloor)
@@ -9888,7 +10452,7 @@ cp
eK
fd
fd
-bW
+bh
fO
gg
gg
@@ -9988,9 +10552,9 @@ cH
cH
cp
eL
-bW
-bW
-bW
+bh
+Ip
+bh
fP
gh
gA
@@ -10010,7 +10574,7 @@ jN
jN
jN
jN
-jN
+uz
le
lB
kC
@@ -10081,7 +10645,7 @@ vb
bf
bm
bw
-bW
+bh
cp
cJ
cp
@@ -10090,16 +10654,16 @@ cp
cp
cp
eM
-bW
+bh
fj
fC
-cq
-cq
-cq
-cq
-cq
-cq
-cq
+OZ
+OZ
+HM
+pq
+pq
+pq
+pq
hR
ii
Hc
@@ -10183,25 +10747,25 @@ wb
am
bn
Ob
-bW
-bW
-bz
-bW
-bW
+bh
+bh
+qN
bW
bW
bW
bW
bW
+FZ
+bh
fk
-bW
-bW
+bh
+bh
bV
gB
gB
-bW
+bh
gB
-bW
+Ip
hS
ij
iz
@@ -10304,7 +10868,7 @@ gi
hd
gC
hH
-bz
+qN
ij
iA
iL
@@ -10397,7 +10961,7 @@ bZ
bZ
bZ
bZ
-bz
+EO
bZ
fQ
fQ
@@ -10497,7 +11061,7 @@ dx
dM
eh
ew
-ex
+Be
bZ
Wb
fE
@@ -10601,7 +11165,7 @@ ei
ex
eO
bZ
-bz
+EO
bZ
fS
gk
@@ -10703,7 +11267,7 @@ ej
ek
eP
bZ
-bz
+EO
bZ
fT
gk
@@ -10797,7 +11361,7 @@ aB
bB
ca
cu
-cN
+AK
df
dx
dP
@@ -10805,7 +11369,7 @@ ek
ek
eQ
bZ
-bz
+EO
bZ
fU
gl
@@ -10820,8 +11384,8 @@ iE
iO
hn
jn
-hw
-hw
+nP
+nP
ke
ga
hE
@@ -10904,10 +11468,10 @@ dg
dx
dQ
ek
-dR
+Ff
eR
bZ
-bz
+EO
bZ
fV
gm
@@ -10935,7 +11499,7 @@ lG
lI
kC
mR
-mX
+Gi
kC
nr
nr
@@ -11009,7 +11573,7 @@ ek
ek
eQ
bZ
-bz
+ux
bZ
fW
gl
@@ -11111,7 +11675,7 @@ ek
ey
eS
bZ
-bz
+EO
bZ
fX
gk
@@ -11126,9 +11690,9 @@ hw
hw
ga
jq
-gG
-gG
-gG
+vW
+vW
+vW
kp
jI
Kc
@@ -11213,7 +11777,7 @@ ek
ez
eT
bZ
-bz
+EO
bZ
fY
gn
@@ -11308,11 +11872,11 @@ bF
ca
cy
cP
-dg
+Uo
dx
-dT
+kK
el
-ek
+nJ
eU
ff
Xb
@@ -11331,8 +11895,8 @@ hw
ga
js
jG
-gG
-gG
+vW
+vW
kr
jI
Mc
@@ -11435,7 +11999,7 @@ jt
jH
jT
kh
-ks
+WF
jI
kJ
kT
@@ -11533,7 +12097,7 @@ hM
hM
ge
ja
-ge
+XX
jI
jI
ki
@@ -11627,7 +12191,7 @@ gc
gp
gG
ks
-gt
+RG
hy
ge
ge
@@ -11713,7 +12277,7 @@ aa
aa
bq
bJ
-cc
+DE
cA
yb
Ab
@@ -11729,7 +12293,7 @@ bq
gq
gH
gX
-gt
+RG
ge
ge
hZ
@@ -11831,7 +12395,7 @@ bq
gr
gG
gG
-gt
+RG
ge
hN
ia
@@ -11933,7 +12497,7 @@ bq
gs
gI
gY
-gt
+RG
ge
ge
ib
@@ -11943,7 +12507,7 @@ iR
ib
ge
jJ
-ib
+sx
ge
ia
ge
@@ -12032,12 +12596,12 @@ bq
fu
bq
bq
-gt
-gt
-gt
+RG
+RG
+RG
hg
ge
-gJ
+dp
ic
ic
ge
@@ -12123,7 +12687,7 @@ bq
bN
cg
bq
-cF
+TZ
dn
dE
dn
@@ -12241,17 +12805,17 @@ gJ
gZ
hi
hA
-ge
+ga
id
ge
ge
iS
-ge
+ga
id
hj
ge
hA
-ge
+ga
id
kJ
kV
@@ -12260,7 +12824,7 @@ kV
kV
kV
kC
-mR
+Um
mH
kC
aa
@@ -12347,7 +12911,7 @@ fK
ge
ge
ge
-fx
+Vn
jb
ge
ge
@@ -12533,7 +13097,7 @@ ck
cD
cV
NZ
-Nx
+PO
FM
NZ
eG
@@ -12550,7 +13114,7 @@ hy
ge
ge
ge
-ge
+Dp
hN
ge
ge
@@ -12639,7 +13203,7 @@ Px
xC
NZ
eG
-cF
+SY
br
fz
fL
@@ -12860,7 +13424,7 @@ ge
ge
hD
iT
-ge
+zU
jX
kl
ge
@@ -12954,7 +13518,7 @@ fz
fL
gf
ge
-ge
+XX
ge
ge
ge
@@ -13045,7 +13609,7 @@ cF
dr
dr
dr
-dr
+IY
cF
fb
br
diff --git a/maps/away/casino/casino_objects.dm b/maps/away/casino/casino_objects.dm
new file mode 100644
index 00000000000..82cb29ae744
--- /dev/null
+++ b/maps/away/casino/casino_objects.dm
@@ -0,0 +1,165 @@
+#define CATASTROPHE_ZOMBIES 1
+#define CATASTROPHE_INFESTATION 2
+
+// Randomized problem
+// Selects one at round-start and applies throughout the away site at landmarks
+/obj/effect/landmark/casino_catastrophe
+ delete_me = TRUE
+ var/global/catastrophe_type = 0
+
+/obj/effect/landmark/casino_catastrophe/New()
+ if(!catastrophe_type)
+ catastrophe_type = rand(CATASTROPHE_ZOMBIES, CATASTROPHE_INFESTATION)
+ return ..()
+
+// Weak enemies
+/obj/effect/landmark/casino_catastrophe/weak_enemy
+ name = "Casino Ship - Weak Enemy Spawn"
+ icon_state = "x3"
+
+/obj/effect/landmark/casino_catastrophe/weak_enemy/Initialize()
+ if(prob(33))
+ return ..()
+
+ switch(catastrophe_type)
+ if(CATASTROPHE_ZOMBIES)
+ new /mob/living/carbon/human/zombie(loc)
+ if(CATASTROPHE_INFESTATION)
+ var/mob_type = pick(/mob/living/simple_animal/hostile/infestation/broodling, /mob/living/simple_animal/hostile/infestation/floatfly, /mob/living/simple_animal/hostile/infestation/spitter)
+ new mob_type(loc)
+
+ return ..()
+
+// Normal enemies
+/obj/effect/landmark/casino_catastrophe/normal_enemy
+ name = "Casino Ship - Normal Enemy Spawn"
+ icon_state = "x2"
+
+/obj/effect/landmark/casino_catastrophe/normal_enemy/Initialize()
+ var/mob_type = /mob/living/simple_animal/hostile/carp
+ switch(catastrophe_type)
+ if(CATASTROPHE_ZOMBIES)
+ mob_type = pick(/mob/living/carbon/human/zombie/fast, /mob/living/carbon/human/zombie/juggernaut)
+ if(CATASTROPHE_INFESTATION)
+ mob_type = pick(/mob/living/simple_animal/hostile/infestation/assembler, /mob/living/simple_animal/hostile/infestation/eviscerator, /mob/living/simple_animal/hostile/infestation/larva/implant/implanter)
+ new mob_type(loc)
+
+ return ..()
+
+// Strong enemies
+/obj/effect/landmark/casino_catastrophe/strong_enemy
+ name = "Casino Ship - Strong Enemy Spawn"
+ icon_state = "x"
+
+/obj/effect/landmark/casino_catastrophe/strong_enemy/Initialize()
+ var/mob_type = /mob/living/simple_animal/hostile/carp
+ switch(catastrophe_type)
+ if(CATASTROPHE_ZOMBIES)
+ mob_type = /mob/living/carbon/human/zombie/juggernaut/armored
+ if(CATASTROPHE_INFESTATION)
+ mob_type = /mob/living/simple_animal/hostile/infestation/rhino
+ new mob_type(loc)
+
+ return ..()
+
+// Dangerous event spawned in the middle of the casino
+/obj/effect/landmark/casino_catastrophe/central_danger
+ name = "Casino Ship - Central Danger"
+ icon_state = "x"
+
+/obj/effect/landmark/casino_catastrophe/central_danger/Initialize()
+ switch(catastrophe_type)
+ if(CATASTROPHE_INFESTATION)
+ new /obj/infestation_structure/hive_heart(loc)
+ var/turf/T = pick_turf_in_range(loc, 3, list(/proc/not_turf_contains_dense_objects))
+ new /obj/infestation_structure/pike_burrow(T)
+
+ return ..()
+
+#undef CATASTROPHE_ZOMBIES
+#undef CATASTROPHE_INFESTATION
+
+/obj/effect/shuttle_landmark/nav_casino/cutter_hangar
+ name = "Casino Hangar"
+ landmark_tag = "nav_casino_hangar"
+ base_area = /area/casino/casino_hangar
+ base_turf = /turf/simulated/floor/plating
+
+/obj/effect/shuttle_landmark/nav_casino/cutter_transit
+ name = "In transit"
+ landmark_tag = "nav_casino_transit"
+
+/obj/machinery/computer/shuttle_control/explore/casino_cutter
+ name = "cutter control console"
+ shuttle_tag = "Casino Cutter"
+
+/obj/structure/casino
+ icon = 'maps/away/casino/casino_sprites.dmi'
+
+/obj/structure/casino/roulette
+ name = "roulette"
+ desc = "Spin the roulette to try your luck."
+ icon_state = "roulette_r"
+ density = FALSE
+ anchored = TRUE
+ var/busy = FALSE
+
+/obj/structure/casino/roulette/attack_hand(mob/user as mob)
+ if(busy)
+ to_chat(user,SPAN_NOTICE("You cannot spin now! \The [src] is already spinning."))
+ return
+
+ visible_message(SPAN_NOTICE("\ [user] spins the roulette and throws inside little ball."))
+ busy = TRUE
+ var/n = rand(0,36)
+ var/color = "green"
+ add_fingerprint(user)
+ if((n>0 && n<11) || (n>18 && n<29))
+ if(n%2)
+ color="red"
+ else
+ color="black"
+ if((n>10 && n<19) || (n>28) )
+ if(n%2)
+ color="black"
+ else
+ color="red"
+
+ spawn(5 SECONDS)
+ visible_message(SPAN_NOTICE("\The [src] stops spinning, the ball landing on [n], [color]."))
+ busy = FALSE
+
+/obj/structure/casino/roulette_chart
+ name = "roulette chart"
+ desc = "Roulette chart. Place your bets! "
+ icon_state = "roulette_l"
+ density = FALSE
+ anchored = TRUE
+
+/obj/structure/casino/bj_table
+ name = "blackjack table"
+ desc = "This is a blackjack table. "
+ icon_state = "bj_left"
+ density = FALSE
+ anchored = TRUE
+
+/obj/structure/casino/bj_table/bj_right
+ icon_state = "bj_right"
+
+/obj/structure/casino/oh_bandit
+ name = "one armed bandit"
+ desc = "Turned off slot machine. "
+ icon_state = "slot_machine"
+ density = FALSE
+ anchored = TRUE
+
+/obj/structure/casino/craps
+ name = "craps table"
+ desc = "Craps table: roll dice!"
+ icon_state = "craps_top"
+ density = FALSE
+ anchored = TRUE
+
+/obj/structure/casino/craps/craps_down
+ icon_state = "craps_down"
+