From c98fa60f668d6443eb31446424a41bcc2d8f2be3 Mon Sep 17 00:00:00 2001 From: Rukofamicom Date: Tue, 23 Jul 2024 22:26:01 -0500 Subject: [PATCH] Revert "Pirate shuttle rebalancing and update (#11221)" (#11228) This reverts commit 00c836b9ae1e2b363037f64f0eb6f95f0ed5ad99. --- _maps/shuttles/pirate/pirate_default.dmm | 98 ++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm index 0020b677aa267..c3453ac138e15 100644 --- a/_maps/shuttles/pirate/pirate_default.dmm +++ b/_maps/shuttles/pirate/pirate_default.dmm @@ -46,6 +46,9 @@ "cm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-23" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/shuttle/pirate) @@ -170,6 +173,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, /turf/open/floor/plating, /area/shuttle/pirate) "fS" = ( @@ -186,6 +192,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-29" + }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, @@ -242,8 +251,7 @@ name = "snitch's bed" }, /mob/living/simple_animal/parrot{ - name = "Snitch"; - faction = list("pirate") + name = "Snitch" }, /turf/open/floor/pod/dark, /area/shuttle/pirate) @@ -449,8 +457,10 @@ /obj/item/gun/ballistic/shotgun/doublebarrel{ pixel_y = 6 }, +/obj/item/gun/ballistic/shotgun/automatic/bulldog/unrestricted{ + pixel_y = -5 + }, /obj/effect/turf_decal/stripes/line, -/obj/item/gun/ballistic/shotgun/doublebarrel/improvised, /turf/open/floor/iron/tech, /area/shuttle/pirate) "ok" = ( @@ -495,6 +505,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-223" + }, /obj/structure/chair/fancy/bench, /obj/structure/fluff/fans{ pixel_x = -24 @@ -565,6 +578,10 @@ /area/shuttle/pirate) "qF" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/cone{ + pixel_x = -18; + pixel_y = 17 + }, /obj/item/toy/gun{ pixel_y = -9; pixel_x = 13 @@ -722,7 +739,6 @@ pixel_y = 3 }, /obj/item/storage/belt/bandolier, -/obj/item/storage/belt/bandolier, /turf/open/floor/iron/tech, /area/shuttle/pirate) "to" = ( @@ -968,6 +984,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-223" + }, /obj/item/stack/rods/five{ pixel_x = 6; pixel_y = -11 @@ -1001,6 +1020,9 @@ /turf/open/floor/wood, /area/shuttle/pirate) "BN" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, /obj/item/chair{ pixel_y = -1; pixel_x = -2 @@ -1124,6 +1146,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-46" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -1217,6 +1242,7 @@ /area/shuttle/pirate) "FY" = ( /obj/structure/girder/reinforced, +/obj/effect/turf_decal/weather/dirt, /turf/open/floor/plating{ burnt = 1 }, @@ -1262,6 +1288,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1460,6 +1489,10 @@ pixel_x = -1; pixel_y = -4 }, +/obj/item/grenade/stingbang{ + pixel_x = 5; + pixel_y = -9 + }, /turf/open/floor/iron/tech, /area/shuttle/pirate) "LZ" = ( @@ -1595,6 +1628,9 @@ /turf/open/floor/pod, /area/shuttle/pirate) "Pq" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /obj/item/trash/pistachios{ pixel_x = 8; @@ -1655,13 +1691,39 @@ dir = 8; layer = 2.9 }, +/obj/item/ammo_box/magazine/m12g/breacher{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/m12g/breacher{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = -7 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = -7; + pixel_y = -3 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = 7 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = 7; + pixel_y = -3 + }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/item/storage/box/lethalshot{ - pixel_y = 9 - }, -/obj/item/storage/box/breacherslug, /turf/open/floor/iron/tech, /area/shuttle/pirate) "QU" = ( @@ -1718,6 +1780,9 @@ /turf/open/floor/iron/tech, /area/shuttle/pirate) "Ss" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, /obj/effect/decal/cleanable/blood/old{ pixel_x = -2; pixel_y = 5; @@ -1731,6 +1796,9 @@ dir = 8; pixel_x = -24 }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-223" + }, /turf/open/floor/plating, /area/shuttle/pirate) "Sx" = ( @@ -1792,6 +1860,9 @@ pixel_y = -8 }, /obj/structure/closet/crate/large, +/obj/effect/turf_decal/weather/dirt/corner{ + dir = 1 + }, /obj/structure/grille/broken, /obj/structure/fluff/fans{ pixel_x = -24 @@ -1833,6 +1904,9 @@ /area/shuttle/pirate) "TO" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-21" + }, /obj/machinery/button/door{ name = "Cargo Shutters"; pixel_x = 22; @@ -1990,6 +2064,9 @@ pixel_x = -7; pixel_y = 24 }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-29" + }, /obj/item/trash/semki{ pixel_x = 11; pixel_y = 2 @@ -2005,6 +2082,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -2105,6 +2183,7 @@ pixel_y = -3; pixel_x = -2 }, +/obj/effect/turf_decal/weather/dirt/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -2114,6 +2193,9 @@ /obj/structure/sign/painting/library{ pixel_y = -32 }, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-74" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 },