From 26ea1d92357a139c526de53bb46353e788cb107f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:02:15 +0100 Subject: [PATCH] [MIRROR] Minor fixes to mimesvsclowns ruin (Abandoned Mime Outpost) [MDB IGNORE] (#25144) * Minor fixes to mimesvsclowns ruin (Abandoned Mime Outpost) (#79811) ## About The Pull Request Replaces the 'energy weapon lens' items with spent .357 shells. Moves shells to the tiles they're on rather than relying on pixel shifting. Removes a duplicate grille. Grille was placed under a window spawner. ## Why It's Good For The Game The energy weapon lenses are ammunition for a secborg's gun. They shouldn't be visible to players and they don't do anything because the secborg gun is unobtainable. Duplicate grilles are ugly for players and the pixel shift thing is annoying for any future mappers touching this file. ## Changelog :cl: fix: Removed a duplicate grille from the abandoned mime outpost space ruin, and replaced the 'energy weapon lenses' with spent revolver rounds. /:cl: * Minor fixes to mimesvsclowns ruin (Abandoned Mime Outpost) --------- Co-authored-by: Da Cool Boss <142358580+DaCoolBoss@users.noreply.github.com> --- .../RandomRuins/SpaceRuins/mimesvsclowns.dmm | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm b/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm index d7186f44776..6a7c71ad938 100644 --- a/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm +++ b/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm @@ -6,6 +6,11 @@ /area/ruin) "dI" = ( /obj/item/grown/bananapeel, +/obj/item/ammo_casing/a357/spent{ + dir = 9; + pixel_x = -13; + pixel_y = 10 + }, /turf/open/floor/iron/checker/airless, /area/ruin) "ef" = ( @@ -71,20 +76,21 @@ /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 }, -/obj/item/ammo_casing/energy/c3dbullet{ - pixel_y = 10; - pixel_x = 115; - dir = 9 - }, /obj/effect/decal/cleanable/blood/gibs, /obj/machinery/light/small/broken/directional/south, +/obj/item/ammo_casing/a357/spent, /turf/open/floor/iron/checker/airless, /area/ruin) "uc" = ( -/obj/item/ammo_casing/energy/c3dbullet, /obj/effect/decal/cleanable/blood/footprints{ dir = 4 }, +/obj/item/ammo_casing/a357/spent{ + pixel_x = -5; + dir = 5; + pixel_y = 6 + }, +/obj/item/ammo_casing/a357/spent, /obj/item/gps/spaceruin, /turf/open/floor/plating/airless, /area/ruin) @@ -139,11 +145,6 @@ /turf/open/floor/iron/checker/airless, /area/ruin) "Ar" = ( -/obj/item/ammo_casing/energy/c3dbullet{ - dir = 5; - pixel_x = 59; - pixel_y = 6 - }, /obj/item/clothing/mask/gas/clown_hat{ pixel_y = 39 }, @@ -216,7 +217,6 @@ /area/ruin) "JK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber, -/obj/item/ammo_casing/energy/c3dbullet, /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/plating/airless, /area/ruin) @@ -252,8 +252,8 @@ /area/ruin) "Pq" = ( /obj/machinery/light/broken/directional/north, -/obj/item/ammo_casing/energy/c3dbullet, /obj/structure/reagent_dispensers/watertank, +/obj/item/ammo_casing/a357/spent, /turf/open/floor/iron/checker/airless, /area/ruin) "Qb" = ( @@ -267,7 +267,6 @@ /turf/open/floor/iron/checker/airless, /area/ruin) "Vj" = ( -/obj/structure/grille, /obj/effect/spawner/structure/window/reinforced, /obj/effect/mapping_helpers/damaged_window, /obj/effect/decal/cleanable/blood/splatter/over_window,