From 46ce99c91d3be8943eb4b848b4efdd7cd6f4efcb Mon Sep 17 00:00:00 2001 From: Kassc Date: Wed, 17 Aug 2022 17:05:16 -0400 Subject: [PATCH] Gallery Fixes 1.0 -Fixed gallery maint access to null. -slapped an ATM in the patient ward. -Removed E-cig and added artist attire. -Changed frosted glass to glass in the library. --- maps/southern_cross/southern_cross-2.dmm | 95 ++++++++++++++---------- vorestation.dme | 8 +- 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 8901f971e0..daf444d713 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -36739,33 +36739,32 @@ /area/maintenance/bar) "cme" = ( /obj/structure/table/woodentable, -/obj/item/clothing/mask/smokable/ecig/deluxe{ - pixel_y = 6; - pixel_x = -4 - }, -/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine, -/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime{ - pixel_y = 0; - pixel_x = 4 - }, -/obj/item/weapon/reagent_containers/ecig_cartridge/mint{ - pixel_x = 8 - }, -/obj/item/clothing/mask/smokable/ecig/deluxe{ - pixel_y = 6; - pixel_x = -4 - }, -/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine, -/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime{ - pixel_y = 0; - pixel_x = 4 - }, -/obj/item/weapon/reagent_containers/ecig_cartridge/mint{ - pixel_x = 8 - }, /obj/machinery/light{ dir = 4 }, +/obj/item/clothing/suit/storage/apron/white{ + pixel_y = 7; + pixel_x = -6 + }, +/obj/item/clothing/suit/storage/apron/white{ + pixel_y = 7; + pixel_x = 7 + }, +/obj/item/clothing/suit/storage/apron/white{ + pixel_y = 6 + }, +/obj/item/clothing/glasses/regular/hipster{ + pixel_y = -2; + pixel_x = 4 + }, +/obj/item/clothing/mask/smokable/pipe/cobpipe{ + pixel_y = 3; + pixel_x = -4 + }, +/obj/item/clothing/head/beret{ + pixel_x = 5; + pixel_y = 11 + }, /turf/simulated/floor/tiled, /area/crew_quarters/seconddeck/artgallery) "cmg" = ( @@ -37551,10 +37550,10 @@ /obj/structure/bed/chair/sofa/brown{ layer = 2.9 }, -/obj/structure/window/reinforced/tinted/frosted{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/window/basic{ dir = 1 }, /turf/simulated/floor/carpet/oracarpet, @@ -37577,12 +37576,12 @@ /obj/structure/bed/chair/sofa/corner/brown{ layer = 2.9 }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/structure/window/basic{ + dir = 1 + }, /turf/simulated/floor/carpet/oracarpet, /area/library) "coZ" = ( @@ -44557,9 +44556,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_one_access = list(25,28) - }, +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -51689,16 +51686,15 @@ /area/hallway/primary/seconddeck/aft) "hlC" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom/department/medbay{ - dir = 1; - pixel_y = 21 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/atm{ + pixel_y = 30 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "hlN" = ( @@ -59912,9 +59908,6 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "lJh" = ( -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, @@ -59922,6 +59915,9 @@ dir = 2; layer = 2.9 }, +/obj/structure/window/basic{ + dir = 1 + }, /turf/simulated/floor/carpet/oracarpet, /area/library) "lJn" = ( @@ -63399,7 +63395,6 @@ /area/medical/morgue) "nIS" = ( /obj/structure/table/standard, -/obj/fiftyspawner/cardboard, /obj/item/weapon/storage/box, /obj/item/weapon/storage/box, /obj/item/weapon/storage/box{ @@ -70623,6 +70618,11 @@ dir = 8; pixel_x = 24 }, +/obj/fiftyspawner/cardboard, +/obj/item/device/threadneedle, +/obj/item/device/threadneedle{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/crew_quarters/seconddeck/artsupplies) "rOI" = ( @@ -79688,6 +79688,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/apcenter) +"xjT" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/item/device/radio/intercom/department/medbay{ + dir = 4; + pixel_x = 21 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "xka" = ( /obj/structure/lattice, /obj/machinery/shield_diffuser, @@ -130745,7 +130758,7 @@ ylt odi xom iOS -dTG +xjT pkK oht rxD diff --git a/vorestation.dme b/vorestation.dme index fd77442319..d7472dce7e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1889,10 +1889,10 @@ #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" #include "code\modules\ai\say_list_ch.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_ch.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" -#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_ch.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm" +#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\atmosphere_alarm.dm"