diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 8e5d06138529d..c165f9add587c 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -227,7 +227,7 @@ jobs: compare_screenshots: if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success' - needs: [ collect_data, run_all_tests, run_alternate_tests ] + needs: [ collect_data, run_alternate_tests ] name: Compare Screenshot Tests timeout-minutes: 15 runs-on: ubuntu-22.04 diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_surface_gas_bubber.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_surface_gas_bubber.dmm index d7af2438b786d..3cd659450f68a 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_surface_gas_bubber.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_surface_gas_bubber.dmm @@ -169,23 +169,15 @@ "gm" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, -/obj/item/food/cornuto{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = 2 - }, -/obj/item/food/cornuto{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = -3 - }, /obj/structure/closet/crate/freezer, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -355,10 +347,11 @@ /area/icemoon/underground/unexplored) "lt" = ( /obj/machinery/vending/dorms{ - onstation = 0 + density = 0; + pixel_y = -32 }, -/turf/closed/wall/r_wall{ - baseturfs = /turf/open/floor/plating/lavaland_baseturf +/turf/open/floor/iron{ + baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, /area/ruin/powered/lizard_gas) "lK" = ( @@ -567,6 +560,22 @@ }, /obj/structure/closet/crate/freezer, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = 2 + }, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -649,10 +658,6 @@ /obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /obj/item/pickaxe, -/obj/item/gun/ballistic/rifle/boltaction/pipegun, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, /obj/item/storage/box/coffeepack/robusta, /obj/item/storage/box/coffeepack/robusta, /obj/item/flatpacked_machine, @@ -660,6 +665,7 @@ /obj/item/flatpacked_machine/sustenance_machine, /obj/item/flatpacked_machine/organics_ration_printer, /obj/item/flatpacked_machine/macrowave, +/obj/item/gun/energy/laser/musket, /turf/open/floor/iron/smooth{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -1958,7 +1964,7 @@ qM qM Xn qM -qM +gv gv gv gv @@ -1979,11 +1985,10 @@ Ji ed Ji ur -qM +ur qM HE Jv -Py lt qM gv @@ -1993,6 +1998,7 @@ gv gv gv gv +gv "} (24,1,1) = {" gv @@ -2006,13 +2012,13 @@ wN RW mE pO -qM +ur qM Kr kI ei qM -qM +gv gv gv gv @@ -2033,13 +2039,13 @@ Md Ji Ji Ji +ur qM qM qM qM qM -qM -qM +gv gv gv gv diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_gas_bubber.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_gas_bubber.dmm index 23907c1d0b62f..328f4fce5d736 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_gas_bubber.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_gas_bubber.dmm @@ -45,6 +45,22 @@ }, /obj/structure/closet/crate/freezer, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = 2 + }, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -418,10 +434,11 @@ /area/lavaland/surface/outdoors) "oT" = ( /obj/machinery/vending/dorms{ - onstation = 0 + density = 0; + pixel_y = -32 }, -/turf/closed/wall/r_wall{ - baseturfs = /turf/open/floor/plating/lavaland_baseturf +/turf/open/floor/iron{ + baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, /area/ruin/thelizardsgas_lavaland) "pp" = ( @@ -445,10 +462,6 @@ /obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /obj/item/pickaxe, -/obj/item/gun/ballistic/rifle/boltaction/pipegun, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, /obj/item/storage/box/coffeepack/robusta, /obj/item/storage/box/coffeepack/robusta, /obj/item/flatpacked_machine, @@ -456,6 +469,7 @@ /obj/item/flatpacked_machine/sustenance_machine, /obj/item/flatpacked_machine/organics_ration_printer, /obj/item/flatpacked_machine/macrowave, +/obj/item/gun/energy/laser/musket, /turf/open/floor/iron/smooth{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -1313,23 +1327,15 @@ "Zf" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, -/obj/item/food/cornuto{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = 2 - }, -/obj/item/food/cornuto{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = -3 - }, /obj/structure/closet/crate/freezer, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -1734,11 +1740,10 @@ DI DI DI DI -FA +DI FA cC Bb -xW oT FA DI @@ -1748,6 +1753,7 @@ DI DI DI DI +DI "} (19,1,1) = {" DI @@ -1757,13 +1763,13 @@ DI DI DI DI -FA +DI FA Bw Hd jB FA -FA +DI DI DI DI @@ -1780,13 +1786,13 @@ DI DI DI DI +DI FA FA FA FA FA -FA -FA +DI DI DI DI diff --git a/_maps/RandomRuins/SpaceRuins/bubberstation/thelizardsgas_bubber.dmm b/_maps/RandomRuins/SpaceRuins/bubberstation/thelizardsgas_bubber.dmm index bd714d23827a4..d61059d976173 100644 --- a/_maps/RandomRuins/SpaceRuins/bubberstation/thelizardsgas_bubber.dmm +++ b/_maps/RandomRuins/SpaceRuins/bubberstation/thelizardsgas_bubber.dmm @@ -14,10 +14,6 @@ /obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /obj/item/pickaxe, -/obj/item/gun/ballistic/rifle/boltaction/pipegun, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, -/obj/item/ammo_casing/junk/hunter, /obj/item/storage/box/coffeepack/robusta, /obj/item/storage/box/coffeepack/robusta, /obj/item/flatpacked_machine, @@ -26,6 +22,7 @@ /obj/item/flatpacked_machine/organics_ration_printer, /obj/item/flatpacked_machine/macrowave, /obj/item/storage/toolbox/mechanical, +/obj/item/gun/energy/laser/musket, /turf/open/floor/plating, /area/ruin/space/has_grav/thelizardsgas) "bo" = ( @@ -108,6 +105,14 @@ /area/ruin/space/has_grav/thelizardsgas) "eV" = ( /obj/structure/sign/poster/fluff/lizards_gas_payment/directional/north, +/mob/living/basic/lizard/space{ + desc = "How are you ALIVE?!"; + name = "Blarpo" + }, +/obj/structure/bed/dogbed{ + name = "Blarpo's bed"; + desc = "A comfy-looking lizard bed. Looks a lot like a dog bed." + }, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, @@ -285,23 +290,17 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/thelizardsgas) "vj" = ( -/obj/item/food/cornuto{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = 2 - }, -/obj/item/food/cornuto{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/food/cornuto{ - pixel_y = -5; - pixel_x = -3 - }, /obj/structure/closet/crate/freezer, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/vendor_tray_meal/sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, +/obj/item/food/nigiri_sushi, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -621,15 +620,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/pink/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/thelizardsgas) -"Ua" = ( -/mob/living/basic/lizard/space{ - desc = "How are you ALIVE?!"; - name = "Blarpo" - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/ruin/space/has_grav/thelizardsgas) "Ud" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -710,6 +700,22 @@ pixel_x = 3 }, /obj/structure/closet/crate/freezer, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = -5; + pixel_x = 2 + }, +/obj/item/food/cornuto{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/food/cornuto{ + pixel_y = 5; + pixel_x = 6 + }, /turf/open/floor/iron/freezer{ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface }, @@ -1089,7 +1095,7 @@ mR gS Zs cn -Ua +UO uh CA CA diff --git a/_maps/birdshot.json b/_maps/birdshot.json deleted file mode 100644 index 8f105128176c5..0000000000000 --- a/_maps/birdshot.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "map_name": "Birdshot Station", - "map_path": "map_files/Birdshot", - "map_file": "birdshot.dmm", - "shuttles": { - "cargo": "cargo_skyrat", - "ferry": "ferry_kilo", - "whiteship": "whiteship_birdshot", - "emergency": "emergency_birdshot" - }, - "job_changes": { - "Cook": { - "additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge"] - } - } -} diff --git a/_maps/bubber/automapper/templates/generic/interlink_adminoffice.dmm b/_maps/bubber/automapper/templates/generic/interlink_adminoffice.dmm index 2430c6846844e..2e5abda078edd 100644 --- a/_maps/bubber/automapper/templates/generic/interlink_adminoffice.dmm +++ b/_maps/bubber/automapper/templates/generic/interlink_adminoffice.dmm @@ -4,13 +4,19 @@ /area/centcom/central_command_areas/admin/interlink) "b" = ( /obj/machinery/holopad/secure, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "d" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "e" = ( /obj/machinery/modular_computer/preset/id/centcom, @@ -18,30 +24,67 @@ /area/centcom/central_command_areas/admin/interlink) "g" = ( /obj/structure/table/wood, +/obj/item/folder/red{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 2 + }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) "h" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/fullupgrade, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + pixel_y = 24; + density = 0 + }, /obj/machinery/light/directional/west, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "j" = ( /obj/structure/bed/double, /obj/item/bedsheet/centcom/double, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin/interlink) +"k" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("secret") + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "l" = ( /obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + density = 0; + pixel_y = 24 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin/interlink) +"m" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/vending/boozeomat/all_access{ + density = 0; + pixel_y = 32 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "n" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/admin/interlink) "o" = ( /obj/machinery/light/directional/east, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "p" = ( /obj/structure/table/wood, @@ -56,10 +99,22 @@ /obj/item/stamp{ pixel_y = 10 }, -/obj/machinery/requests_console/auto_name/directional/north, +/obj/machinery/requests_console/auto_name/directional/north{ + pixel_x = 3; + pixel_y = 31 + }, /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, +/obj/machinery/button/door/directional/north{ + name = "Admin Shutter Control"; + id = "admin_shutters"; + pixel_x = -5; + pixel_y = 21 + }, +/obj/item/toy/crayon/white{ + pixel_x = 9 + }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) "q" = ( @@ -69,11 +124,11 @@ /obj/structure/chair/comfy/beige{ dir = 4 }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "r" = ( /obj/structure/dresser, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "s" = ( /obj/structure/filingcabinet/employment, @@ -93,7 +148,13 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "admin_shutters" }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin/interlink) +"v" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "x" = ( /obj/machinery/light/directional/east, @@ -102,25 +163,32 @@ "z" = ( /obj/structure/closet/crate/bin, /obj/machinery/light/directional/west, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "A" = ( /obj/structure/bookcase/random/reference, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "C" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "D" = ( /obj/machinery/computer/camera_advanced, -/obj/machinery/button/door/directional/north{ - name = "Admin Shutter Control"; - id = "admin_shutters"; - pixel_x = -7 +/obj/structure/chalkboard{ + pixel_y = 32 }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) +"E" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/admin/interlink) "F" = ( /obj/machinery/door/airlock/corporate{ name = "Administrative Office" @@ -130,21 +198,22 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "G" = ( /obj/structure/table/wood, -/obj/item/pen/fourcolor{ - pixel_x = 8; - pixel_y = 3 +/obj/item/flashlight/lamp/green{ + pixel_x = -8; + pixel_y = 2 }, +/obj/item/feather, /obj/item/pen/fountain/captain{ pixel_y = -1; pixel_x = 6 }, -/obj/item/flashlight/lamp/green{ - pixel_x = -8; - pixel_y = 2 +/obj/item/pen/fourcolor{ + pixel_x = 8; + pixel_y = 3 }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) @@ -155,20 +224,31 @@ /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) "J" = ( -/obj/machinery/vending/wardrobe/cent_wardrobe, -/turf/open/floor/wood/tile, +/obj/machinery/vending/wardrobe/cent_wardrobe{ + density = 0; + pixel_y = 31; + pixel_x = 6 + }, +/obj/machinery/vending/access/command{ + pixel_x = 28; + density = 0 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "K" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) "L" = ( -/obj/structure/bed/dogbed, +/obj/machinery/photocopier/gratis, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin/interlink) "M" = ( /obj/item/banner/command/mundane, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "N" = ( /obj/structure/fireplace, @@ -176,7 +256,10 @@ pixel_y = -5; pixel_x = -10 }, -/turf/open/floor/wood/tile, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "O" = ( /obj/structure/table/wood, @@ -184,7 +267,7 @@ fax_name = "Administrative Office" }, /obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "P" = ( /obj/structure/table/wood, @@ -195,7 +278,15 @@ /area/centcom/central_command_areas/admin/interlink) "R" = ( /obj/structure/sign/flag/nanotrasen/directional/south, -/turf/open/floor/wood/tile, +/obj/structure/bed/dogbed, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/mob/living/basic/pet/penguin/emperor/neuter{ + desc = "Empress of all she surveys. No wonder the room is kept so cold though!"; + name = "Pengy The Mighty" + }, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "S" = ( /obj/effect/turf_decal/siding/wood{ @@ -204,7 +295,7 @@ /obj/machinery/door/airlock/corporate, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_or_captain, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "T" = ( /turf/open/floor/carpet/royalblack, @@ -213,14 +304,14 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "W" = ( -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) "X" = ( /obj/machinery/light_switch/directional/west, -/turf/open/floor/wood/tile, +/turf/open/floor/wood/large, /area/centcom/central_command_areas/admin/interlink) (1,1,1) = {" @@ -240,8 +331,8 @@ t (2,1,1) = {" n h -W -W +U +U M z u @@ -257,7 +348,7 @@ l T T T -W +v u t t @@ -267,7 +358,7 @@ t "} (4,1,1) = {" n -W +m T T T @@ -282,9 +373,9 @@ t (5,1,1) = {" n N -W +E b -W +E d n t @@ -296,10 +387,10 @@ t (6,1,1) = {" n O -U +q q U -U +k n t t diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index b9099ef5dd5b8..c08251cccfbfe 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -4284,6 +4284,10 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/holding/cafe/park) +"bbB" = ( +/obj/machinery/skill_station, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "bbW" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/wardrobe/gene_wardrobe/ghost_cafe, @@ -65708,7 +65712,7 @@ aGo ayk aqf apc -aUo +atf aUo aUo aUo @@ -66226,7 +66230,7 @@ aqf agV aUo aUo -atf +bbB aqf aqf ajj diff --git a/_maps/northstar.json b/_maps/northstar.json deleted file mode 100644 index bd1a53c562272..0000000000000 --- a/_maps/northstar.json +++ /dev/null @@ -1,38 +0,0 @@ - -{ - "version": 1, - "map_name": "NorthStar", - "map_path": "map_files/NorthStar", - "map_file": "north_star.dmm", - "shuttles": { - "emergency": "emergency_northstar", - "ferry": "ferry_fancy", - "cargo": "cargo_northstar", - "whiteship": "whiteship_delta" - }, - "space_ruin_levels": 3, - "space_empty_levels": 2, - "traits": [ - { - "Up": true, - "Linkage": "Cross" - }, - { - "Up": true, - "Down": true, - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - }, - { - "Up": true, - "Down": true, - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - }, - { - "Down": true, - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - } - ] -} diff --git a/_maps/wawastation.json b/_maps/wawastation.json deleted file mode 100644 index 71d716a56e07e..0000000000000 --- a/_maps/wawastation.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 1, - "map_name": "Wawastation", - "map_path": "map_files/wawastation", - "map_file": "wawastation.dmm", - "shuttles": { - "cargo": "cargo_box", - "ferry": "ferry_fancy", - "whiteship": "whiteship_meta", - "emergency": "emergency_wawa" - }, - "traits": [ - { - "Up": true, - "Baseturf": "/turf/open/misc/asteroid/airless", - "Linkage": "Cross" - }, - { - "Down": true, - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - } - ], - "job_changes": { - "Cook": { - "additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge"] - }, - "Captain": { - "special_charter": "asteroid" - } - } -} diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d00f0fd020734..e6db0cf654308 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -7,13 +7,13 @@ AddComponent(/datum/component/tippable, \ tip_time = 3 SECONDS, \ untip_time = 2 SECONDS, \ - self_right_time = 20 SECONDS, \ + self_right_time = 3 SECONDS, \ post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \ roleplay_friendly = TRUE, \ roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep, /datum/emote/silicon/beep2), /* SKYRAT EDIT CHANGE - ORIGINAL: roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep)*/ \ roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay))) - //BUBBER EDIT: REDUCES THE SELF-RIGHT TIME FOR BORGS TO 20 SECONDS, FROM 60 SECONDS + //BUBBER EDIT: REDUCES THE SELF-RIGHT TIME FOR BORGS TO 3 SECONDS, FROM 60 SECONDS set_wires(new /datum/wires/robot(src)) AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png index e90c493bfc4a5..2224c3bdab9bc 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_husk_body.png b/code/modules/unit_tests/screenshots/screenshot_husk_body.png index f7f1f8a7ac392..621ed5d2f3ec0 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_husk_body.png and b/code/modules/unit_tests/screenshots/screenshot_husk_body.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png b/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png index aff3f07f97e6c..dff1f89549f4a 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png and b/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png differ diff --git a/html/changelogs/AutoChangeLog-pr-2312.yml b/html/changelogs/AutoChangeLog-pr-2312.yml new file mode 100644 index 0000000000000..518d9e925219e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2312.yml @@ -0,0 +1,4 @@ +author: "sippykot" +delete-after: True +changes: + - balance: "borg self un-tip time reduced to 3sec from 20sec" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2318.yml b/html/changelogs/AutoChangeLog-pr-2318.yml new file mode 100644 index 0000000000000..95f4a2380d8d1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2318.yml @@ -0,0 +1,4 @@ +author: "xPokee" +delete-after: True +changes: + - qol: "made it so you can examine what is inside of crates and lockers as an observer" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2322.yml b/html/changelogs/AutoChangeLog-pr-2322.yml new file mode 100644 index 0000000000000..90fc275d76216 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2322.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - rscadd: "Added a Skillsoft machine to the Ghost Cafe vending area" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2325.yml b/html/changelogs/AutoChangeLog-pr-2325.yml new file mode 100644 index 0000000000000..16bca6e559193 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2325.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - bugfix: "Hemophage organs no longer show up on analyzers" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2328.yml b/html/changelogs/AutoChangeLog-pr-2328.yml new file mode 100644 index 0000000000000..adea1374a8372 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2328.yml @@ -0,0 +1,5 @@ +author: "IgiariValkyr" +delete-after: True +changes: + - qol: "The Interlink Administrative Office has had new equipment brought in and installed." + - balance: "Lizard Gas now has slightly better but still shoddy weaponry for its employee." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2333.yml b/html/changelogs/AutoChangeLog-pr-2333.yml new file mode 100644 index 0000000000000..69348c40f457d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2333.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - server: "Removed Northstar, Wawastation, and Birdshot from map configuration cache" \ No newline at end of file diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index 3a3ae703b37f7..99377335fde2f 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -13,6 +13,8 @@ - rscadd: Black-Backed Jackal tail SandPoot: - rscadd: Added mechanical effects to changing your size. + LT3: + - qol: Map vote results only include choices included in the vote TealSeer: - config: Removed config entries for archived maps - bugfix: find_and_buy_event_from_track should no longer randomly fail. diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_hemophage_defines.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_hemophage_defines.dm index 7471839e1dbfa..4081fc5466491 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_hemophage_defines.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_hemophage_defines.dm @@ -1,5 +1,5 @@ /// Organ flag for organs of hemophage origin, or organs that have since been infected by an hemophage's tumor. -#define ORGAN_TUMOR_CORRUPTED (1<<12) // Not taking chances, hopefully this number remains good for a little while. +#define ORGAN_TUMOR_CORRUPTED (1<<15) // Not taking chances, hopefully this number remains good for a little while. /// We have a pulsating tumor, it's active. #define PULSATING_TUMOR_ACTIVE 0 diff --git a/modular_zubbers/code/controllers/subsystem/map_vote.dm b/modular_zubbers/code/controllers/subsystem/map_vote.dm index b99bee2f330fa..ee74da21aa1ff 100644 --- a/modular_zubbers/code/controllers/subsystem/map_vote.dm +++ b/modular_zubbers/code/controllers/subsystem/map_vote.dm @@ -13,6 +13,12 @@ write_cache() update_tally_printout() + var/list/message_data = list() + for(var/map_id in map_vote.choices) + var/datum/map_config/map = config.maplist[map_id] + message_data += "[map.map_name] - [map_vote_cache[map_id]]" + var/filtered_vote_results = "[span_bold("Vote Results (Including Carryover)")]\n\n[message_data.Join("\n")]" + if(admin_override) send_map_vote_notice("Admin Override is in effect. Map will not be changed.", "Tallies are recorded and saved.") return @@ -36,11 +42,11 @@ ASSERT(winner, "No winner found in map vote.") set_next_map(config.maplist[winner]) - var/list/messages = list(tally_printout) - messages += list("
Next Map: [span_cyan(span_bold(next_map_config.map_name))]") + var/list/vote_result_message = list(filtered_vote_results) + vote_result_message += list("
Next Map: [span_cyan(span_bold(next_map_config.map_name))]") var/carryover_percentage = CONFIG_GET(number/map_vote_tally_carryover_percentage) if(carryover_percentage) - messages += list("\n[CONFIG_GET(number/map_vote_tally_carryover_percentage)]% of votes from the losing maps will be carried over and applied to the next map vote.") + vote_result_message += list("\n[CONFIG_GET(number/map_vote_tally_carryover_percentage)]% of votes from the losing maps will be carried over and applied to the next map vote.") // do not reset tallies if only one map is even possible if(length(valid_maps) > 1) @@ -48,9 +54,9 @@ write_cache() update_tally_printout() else - messages += "Only one map was possible, tallies were not reset." + vote_result_message += "Only one map was possible, tallies were not reset." - send_map_vote_notice(arglist(messages)) + send_map_vote_notice(arglist(vote_result_message)) /datum/controller/subsystem/map_vote/send_map_vote_notice(...) var/static/last_message_at @@ -66,4 +72,4 @@ for(var/map_id in map_vote_cache) var/datum/map_config/map = config.maplist[map_id] data += "[map.map_name] - [map_vote_cache[map_id]]" - tally_printout = "[span_bold("Vote Results (Including Carryover)")]\n\n[data.Join("\n")]" + tally_printout = "[span_bold("Current Map Tallies (Including Carryover)")]\n\n[data.Join("\n")]" diff --git a/modular_zubbers/code/game/objects/structures/crates_lockers/closets.dm b/modular_zubbers/code/game/objects/structures/crates_lockers/closets.dm new file mode 100644 index 0000000000000..37e4341b1ba28 --- /dev/null +++ b/modular_zubbers/code/game/objects/structures/crates_lockers/closets.dm @@ -0,0 +1,4 @@ +/obj/structure/closet/examine(mob/user) + . = ..() + if(isobserver(user)) + . += span_info("It contains: [english_list(contents)].") diff --git a/tgstation.dme b/tgstation.dme index ab2988c8099ee..003249e922e87 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8799,6 +8799,7 @@ #include "modular_zubbers\code\game\objects\structures\trash_pile.dm" #include "modular_zubbers\code\game\objects\structures\watercloset.dm" #include "modular_zubbers\code\game\objects\structures\beds_chairs\sofa.dm" +#include "modular_zubbers\code\game\objects\structures\crates_lockers\closets.dm" #include "modular_zubbers\code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "modular_zubbers\code\game\objects\structures\flags\signs_flags.dm" #include "modular_zubbers\code\game\objects\structures\plaques\static_plaques.dm"