From f229d6985ac4d9ce0d511e628d6fda1121bf03bb Mon Sep 17 00:00:00 2001 From: evilew <116174240+evilew@users.noreply.github.com> Date: Fri, 8 Aug 2025 21:41:34 -0500 Subject: [PATCH] adding cream demons and plushies to maps --- _maps/map_files/BoxStation/BoxStation.dmm | 4 ++-- _maps/map_files/KiloStation/KiloStation.dmm | 10 ++++++++- _maps/map_files/MetaStation/MetaStation.dmm | 11 ++++++---- _maps/map_files/Mining/Lavaland_Demone.dmm | 22 ++++++++++++------- _maps/map_files/Mining/Lavaland_Lower.dmm | 6 ++++- _maps/map_files/PubbyStation/PubbyStation.dmm | 20 +++++++++++++---- _maps/map_files/generic/CentCom.dmm | 17 +++++++++++++- 7 files changed, 69 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 28095dc3c0..a42cc3f998 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3319,7 +3319,7 @@ "bna" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/jukebox,/turf/open/floor/carpet/black,/area/service/bar) "bnb" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/carpet/black,/area/service/bar) "bnc" = (/obj/item/ashtray,/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/service/bar) -"bnd" = (/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/service/bar) +"bnd" = (/obj/structure/table/plasmaglass,/obj/item/toy/plush/gs13/gatito{pixel_x = 0; pixel_y = 4},/turf/open/floor/carpet/black,/area/service/bar) "bne" = (/turf/open/floor/carpet/black,/area/service/bar) "bnf" = (/obj/structure/chair/comfy/black{dir = 4},/turf/open/floor/carpet/black,/area/service/bar) "bng" = (/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -4; pixel_y = 6},/obj/structure/table/plasmaglass,/obj/item/ashtray,/turf/open/floor/carpet/black,/area/service/bar) @@ -7802,7 +7802,7 @@ "xiB" = (/obj/effect/landmark/start/warden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "xkX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/department/medical/morgue) "xlw" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/button/door{id = "permacells1"; name = "Privacy Shutters"; pixel_x = 25},/obj/item/book/manual/prisoner_SOP,/turf/open/floor/plasteel/dark,/area/security/prison/cells) -"xme" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/carpet/gato,/area/commons/dorms) +"xme" = (/obj/structure/closet/secure_closet/personal,/obj/item/toy/plush/gs13/gatito{pixel_x = 0; pixel_y = 4},/turf/open/floor/carpet/gato,/area/commons/dorms) "xmo" = (/obj/structure/sign/plaques/golden{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ai_monitored/security/armory) "xnZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/medical/glass{name = "Prison Forestry"; dir = 4},/turf/open/floor/plasteel/dark,/area/security/prison/upper) "xov" = (/obj/machinery/light{dir = 4},/turf/open/floor/grass,/area/security/courtroom) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f77267d578..ad422d3161 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -84136,6 +84136,14 @@ }, /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) +"sqo" = ( +/obj/structure/dresser, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 15 + }, +/turf/open/floor/wood, +/area/commons/locker) "sqP" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /turf/open/floor/engine/o2{ @@ -105571,7 +105579,7 @@ bxO bxQ bzg lbJ -bLu +sqo bUa beo lbJ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2015ea3584..22177b6883 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -81419,7 +81419,10 @@ pixel_x = 29; pixel_y = 1 }, -/obj/item/paper, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "vqN" = ( @@ -84996,9 +84999,9 @@ /area/service/hydroponics/garden) "xgL" = ( /obj/structure/table/wood, -/obj/item/toy/plush/carpplushie{ - color = "red"; - name = "GATO wildlife department space carp plushie" +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 }, /turf/open/floor/carpet, /area/command/corporate_showroom) diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm index c34d018065..bea8e66681 100644 --- a/_maps/map_files/Mining/Lavaland_Demone.dmm +++ b/_maps/map_files/Mining/Lavaland_Demone.dmm @@ -39,7 +39,7 @@ "bu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/carpet/gato,/area/lavaland/demone/living) "bv" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors) "by" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby) -"bz" = (/obj/structure/chair/brass{dir = 8},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"bz" = (/obj/structure/chair/brass{dir = 8},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "bA" = (/turf/open/floor/carpet/gato,/area/ruin/powered/candyland) "bB" = (/obj/machinery/conveyor{dir = 4; id = "donut"},/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factory) "bJ" = (/obj/item/reagent_containers/food/snacks/burger/red,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) @@ -224,6 +224,7 @@ "jT" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "jW" = (/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice) "jY" = (/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple,/turf/open/candyfloor,/area/ruin/powered/candyland) +"jZ" = (/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "ka" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 5},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "ke" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "kf" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -235,6 +236,7 @@ "kt" = (/obj/structure/closet/crate/bin,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel,/area/lavaland/demone/reception) "ku" = (/obj/structure/chair/wood{dir = 1},/turf/open/floor/carpet/black,/area/lavaland/demone/factoryoffice) "kw" = (/obj/structure/chair/sofachair{dir = 1},/turf/open/floor/carpet,/area/lavaland/demone/reception) +"kx" = (/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "kz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/chair/wood/normal{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception) "kE" = (/obj/structure/table,/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "kG" = (/obj/structure/stone_tile/surrounding_tile/cracked{dir = 1},/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors) @@ -423,7 +425,7 @@ "sp" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby) "sq" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen) "ss" = (/obj/item/stack/spacecash/c10,/obj/structure/table/wood,/obj/item/stack/spacecash/c10{pixel_y = 6},/obj/item/stack/spacecash/c10{pixel_y = 12},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) -"su" = (/obj/structure/chair/brass{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast{name = "Cream Demon"},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"su" = (/obj/structure/chair/brass{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "sD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) "sE" = (/obj/structure/stone_tile/slab/cracked{dir = 8},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors) "sH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -454,6 +456,7 @@ "tE" = (/obj/structure/flora/ausbushes/sunnybush,/mob/living/simple_animal/butterfly,/turf/open/floor/grass,/area/lavaland/demone/living) "tF" = (/obj/item/gun/magic/wand/food,/turf/open/chocolateriver,/area/ruin/powered/candyland) "tH" = (/obj/machinery/airalarm/unlocked{pixel_y = -24; dir = 1},/turf/open/floor/wood,/area/lavaland/demone/demonevillage) +"tI" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "tN" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/obj/item/reagent_containers/food/snacks/chocolatebar,/turf/open/candyfloor,/area/ruin/powered/candyland) "tO" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen) "tP" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/corner,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -533,6 +536,7 @@ "wQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "wS" = (/obj/structure/sign/poster/official/fruit_bowl,/turf/closed/wall/mineral/iron,/area/lavaland/demone/factoryoffice) "wX" = (/obj/structure/chair/wood,/obj/item/reagent_containers/food/snacks/chococoin{pixel_y = -9; pixel_x = -12},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) +"wY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "wZ" = (/obj/structure/stone_tile/slab/cracked{dir = 9},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "xd" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage) "xg" = (/obj/machinery/conveyor{dir = 8; id = "donut"},/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factory) @@ -556,6 +560,7 @@ "yh" = (/obj/item/reagent_containers/food/snacks/candyheart,/turf/open/candyfloor,/area/ruin/powered/candyland) "yl" = (/obj/structure/sign/nanotrasen,/turf/closed/wall/mineral/iron,/area/lavaland/demone/factoryoffice) "ym" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating,/area/lavaland/demone/tele) +"yo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "yp" = (/obj/structure/closet/secure_closet/freezer/kitchen,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen) "yr" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "yt" = (/obj/machinery/conveyor{id = "donut"},/obj/machinery/door/poddoor{id = "Donut2"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) @@ -719,6 +724,7 @@ "Fv" = (/obj/item/toy/plush/lizardplushie/kobold,/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "Fw" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/lavaland/demone/living) "Fy" = (/obj/structure/mineral_door/iron,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) +"Fz" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "FB" = (/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/minestorage) "FE" = (/obj/effect/turf_decal/stripes/line{dir = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage) "FH" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele) @@ -827,7 +833,7 @@ "Kw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{dir = 4},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice) "Kx" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen) "KA" = (/obj/effect/turf_decal/bot,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) -"KE" = (/obj/structure/chair/brass{dir = 4},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"KE" = (/obj/structure/chair/brass{dir = 4},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "KG" = (/obj/machinery/light{dir = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/lobby) "KI" = (/obj/machinery/door/airlock/survival_pod/glass,/obj/machinery/poweredfans,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) "KK" = (/obj/machinery/light{dir = 1},/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) @@ -1373,17 +1379,17 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDC krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCenkrkrenkrenenkrenkrkrkrenkrkrkrDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCenenenenDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCenDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkreneneneneneneFDCDCDCDCDCDCDCDCDCljNFOgAwfRQZYrDTcHdNBcljDCDCDCDCDCDCDCrzenenenenenenenenenDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenDCDCDCDCDCDCDCDCkrkrenkrkrenenenenkrkrkrenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCenenenenenDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkreneneneneneFIgIgIgIgIgIgIgIgIgIgIgljljljljljljljljljEOljljIgIgIgIgIgIgDCenenenenenenenenenenenenDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrDCDCDCDCkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenkrenenrrenenkrkrenenkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCenDCDCenenenenenDCDCkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenrrenenenenenenenenenDCDCDCDCDCDCenenenenenenenenenenenkrkrkrkrkrkrkrkrkrenenenenenenIgIglLEDzpHCzpzplLzptPnrsSzpIYzpzpzpOPSyYpHnlLzpzpzplLSeAvIgIgenenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenenenencXenenkrkrkrenkrkrkrDCDCDCDCDCDCaOenenenenenenenenenDCenDCenenenenenrzDCDCkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrrDCDCDCDCenkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenDqwQvSLLLLLLLLdPLLLLLLLLCWSOPyLLLLLLLLulLLLLLLhPerererrTChzpxKbqIgrzrrenenenenenenBVenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenenenencXenenkrkrkrenkrkrkrDCDCDCDCDCDCaOenenenenenenenenenDCenDCenenenenenrzDCDCkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrrDCDCDCDCenkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenDqwQvSLLLLLLLLdPLLLLLLLLCWSOPyLLLLLLLLulLLLLLLhPerererrTChzpxKbqIgrzrrenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrenenkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCenenenenenenrrDCDCDCDCDCDCDCkrkrkrkrkrenenencXenenkrenenkrkrkrkrDCDCDCDCDCenenenenenenenenenenDCenenenenenenenenDCDCkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCeneneneneneneneneniqDCDCenkrkrkrkrkrkrenDCenDCenkrkrkrkrkrkrkrkrkrkrenenenenenenIgzpzptPnrnrnrnrnrnrqxPkyvnrnrnrnrfKnrnrnruiHoRkSyLDSyrnkeIgIgIgoienenenenenendBenenkrkrkrkrDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCkrkrkrenkrkrkrkrenkrkrkrkrkrDCDCDCDCDCDCDCDCDCrKenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrenenenencXenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenenenrzDCDCkrkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrkrkrenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrkrkrkrkrkrenenenenenDNIgEDzpaJNqPnPnPnhyPnxgiYPoPnhyPnhyoYPnPnhyxgPngBzpanzpkfzpzpNzenenenenenenenenenenkrkrkrkrkrDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCkrkrkrkrkrkrkrenenrzkrkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenenrzDCDCDCkrkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenenenenDNIgzpSVOnPoGnCICICICICIIdPoQSScScScVDScScScScScvZzpanzpkfzpzpCsenenenenenenenenenenkrkrkrkrkrkrDCDCkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCkrkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCDCenzVenenenenenenenenrzDCDCDCDCDCDCkrkrkrkrkrenenenenenenenenkrkrkrkrkrkrDCDCDCDCDCenenenenenenenenenenenenenenenenrrDCDCDCkrkrkrkrkrkrenenenenenenkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCenenenenenenenenenenDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenenenenDNIgzpNxokPoczxmNYNYPnPnhyiYhfzpdCzpRserjAIXjAjAIXjAueddTRkeIgIgIgoienenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCenenrrenenenenenenrrenrzDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenenDNIgrxrxbrXKOsXKbrFJScScScScvZkeIgqBoezpexIgRARAIgRARAIgSjxKjiIgrzenenenenenenenenenenELELITELELELELELITELELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCenenrrenenenenenenrrenrzDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenenDNIgrxrxbrXKOsXKbrFJScSctIScvZkeIgqBoezpexIgRARAIgRARAIgSjxKjiIgrzenenenenenenenenenenELELITELELELELELITELELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrenkrkrkrkrkrkrenenenkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrkrDCDCDCDCDCrzenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenDCenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCiqenenenenenenenenenDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrenenenenenenenDNIgzJzJbrwrFewrOsXyzpEkzpzpzpxKoKXyoezpexwoRARAwoRARAwoSjxKZVIgenrrenenenenenenenenenvvzSvvvvvvvvvvvvvvZYELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenkrkrkrkrDCDCDCDCDCenenenDCenenenenenenenenenenenDCDCDCDCkrkrkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCrrenenenenenenenDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneFeFIgzJNDbrOGFewrbrXyzpzpzpzpzpxKoKXyoezpexbMRARARURARADQSjxKodIgenenenenenenenenenenenSCwhMUPNPNPNPNPNMgvvITkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenkrkrkrkrDCDCDCDCDCenenenDCenenenenenenenenenenenDCDCDCDCkrkrkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCrrenenenenenenenDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneFeFIgzJNDbrOGFewrbrXyzpzpzpzpzpxKoKXywYzpFzbMRARARURAkxDQSjxKodIgenenenenenenenenenenenSCwhMUPNPNPNPNPNMgvvITkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCrKenenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCDCenDCDCenenenenenenenenenenaODCDCDCDCkrkrkrenenenenenenenenDCenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCiqenenenenDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneneFIgwOzJbrwrFeiNbrXyzpEMerererLSPruumwerUmOuRARAzeRARAOuSjxKalIgAyenenenenenenenenenenenfYTHgLvTvTvTgLdcvvELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCrzkrkrkrkrenenenenkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenenrrenDCDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCenJrDCenenenenenenenenenrzDCDCDCDCDCkrkrkrenenenenenenenenenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkreneneneneneneneneneFIgzJzJbriNFewrOsXyzpzpzpzpzpxKoKXykaLLudAxYeYeUUYeYetlGbxKihIgNeenenenenenenenenenenenwhRJbLDeKOuqbLMXvvELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenrzenenkrkrkrDCDCDCDCDCDCDCrzzVenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCenenDCenenenenenenenenenrrDCDCDCDCDCkrkrkrkrkrenDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCMKPzMKDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrkrenenenenenenenenenenIgIgrxbrXKOsXKbrqBzpzpzpzpzpkeIgqBzpzpkogARARAgARARAgALcxKkWIgNeenenenenenenenenenenenwhGpeoJJeaJJeodcvvELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCrzkrkrkrkrenenenenkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenenrrenDCDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCenJrDCenenenenenenenenenrzDCDCDCDCDCkrkrkrenenenenenenenenenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkreneneneneneneneneneFIgzJzJbriNFewrOsXyzpzpzpzpzpxKoKXykaLLudAxyoYeUUYeYetlGbxKihIgNeenenenenenenenenenenenwhRJbLDeKOuqbLMXvvELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenrzenenkrkrkrDCDCDCDCDCDCDCrzzVenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCenenDCenenenenenenenenenrrDCDCDCDCDCkrkrkrkrkrenDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCMKPzMKDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrkrenenenenenenenenenenIgIgrxbrXKOsXKbrqBzpzpzpjZzpkeIgqBzpzpkogARARAgARARAgALcxKkWIgNeenenenenenenenenenenenwhGpeoJJeaJJeodcvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenenenenkrkrDCDCDCDCDCDCDCiqenenenenenenenenenenenzVhIenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCenenDCenenenenenenenrrenDCDCDCDCDCDCkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCiqeniqDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrenenenenenenenenenenenIgzJzJIgxmczPooJnrnrnrnrnrsSzppszpzpzpkoIgRARAIgRARAIgLcxKVzIgfBenenenenenenenenenenenwhGpgLJJJJJJgLdcvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrkrkrkrenenenenkrDCDCDCDCDCDCDChIenenenenenenenenenhIenDCDCDCrriqenenenenenDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCenenenenenenenenenenenrzDCDCDCDCDCDCkrkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCeneneneniqDCDCDCDCDCenkrkrkrkrkrkrenDCDCDCenkrkrkrkrenenenenenenBVenenenenenIgzJAZrxPkczbByxyxCtyxbBPohfzpzpzpzpzpOwuYsHsHuYsHsHuYtUxKwkIgenenenenenenenenenenenenwhRJbLRpXMRNbLMXvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrkrkrkrkrenenkrkrDCDCDCDCDCDCDCenenenenenenenenenANDCDCDCDCDCDCDChIenenenenenaODCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCrzenenenenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCrrenenenenenDCDCDCDCenenkrkrkrkrkrkrenDCenenkrkrkrkrkrenenenenenenenenenenenenIgAZzJIgPoLgScScvxScSczLPohfJZzpzpzpzpzpJZzpzpJZzpzpJZAIxKEYIgIgoienenenenenenenenenenfYTHgLgLgLgLgLdcvvELkrkrkrkrkrkrkr diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 0817169087..35ade5b153 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -5669,7 +5669,10 @@ pixel_y = 23 }, /obj/structure/table/wood, -/obj/item/flashlight/lamp/green, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/xenoarch/gen) "mz" = ( @@ -13293,6 +13296,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, +/obj/item/toy/plush/gs13/gatito, /turf/open/indestructible/hotelwood, /area/xenoarch/gen) "MP" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 80c81de414..a102a38c04 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -34210,12 +34210,12 @@ /turf/open/floor/wood, /area/commons/fitness/recreation) "bsi" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, +/obj/structure/chair/sofa/corner{ + dir = 4 + }, /turf/open/floor/carpet, /area/commons/fitness/recreation) "bsj" = ( @@ -34225,6 +34225,10 @@ name = "drain" }, /obj/structure/chair/sofa/left, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 4 + }, /turf/open/floor/carpet, /area/commons/fitness/recreation) "bsk" = ( @@ -57301,6 +57305,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"gEo" = ( +/obj/structure/chair/comfy/black, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "gFh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -96390,7 +96402,7 @@ aqJ arK aiM atT -auR +gEo avV axb ayb diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index df32e50096..f4ba8ae8a2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3407,6 +3407,10 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/table, /obj/machinery/light, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/plasteel, /area/centcom/control) "cGI" = ( @@ -12860,6 +12864,10 @@ name = "drain" }, /obj/structure/chair/sofa, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/black, /area/centcom/ferry) "jJT" = ( @@ -21622,11 +21630,14 @@ /area/centcom/ferry) "qbp" = ( /obj/structure/table/wood, -/obj/item/storage/dice, /obj/machinery/light, /obj/structure/sign/poster/official/gato_logo{ pixel_y = -32 }, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/centcom/evac) "qbS" = ( @@ -29334,6 +29345,10 @@ name = "CentCom Customs"; req_access_txt = "109" }, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/plasteel, /area/centcom/evac) "vPo" = (