From eb661079bc50c533ec748e31b497d7a96bf5aea6 Mon Sep 17 00:00:00 2001 From: LT3 <83487515+lessthnthree@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:36:57 -0700 Subject: [PATCH 01/16] Map vote results announcement only shows eligible choices (#2315) ## About The Pull Request Filters the map vote results to only show the options that were in the current vote ## Why It's Good For The Game Less wondering why Kilostation wasn't chosen despite having the most votes. (Because there are too many players.) ## Proof Of Testing We gotta do this one live. ## Changelog :cl: LT3 qol: Map vote results only include choices included in the vote /:cl: --- .../code/controllers/subsystem/map_vote.dm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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")]" From 7e1fc89be2ebaf7cd4020ff9ce1a50013c31f9b5 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun, 3 Nov 2024 08:37:21 +0100 Subject: [PATCH 02/16] Automatic changelog for PR #2315 [ci skip] --- html/changelogs/AutoChangeLog-pr-2315.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2315.yml diff --git a/html/changelogs/AutoChangeLog-pr-2315.yml b/html/changelogs/AutoChangeLog-pr-2315.yml new file mode 100644 index 0000000000000..ea91a6d55e4cf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2315.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - qol: "Map vote results only include choices included in the vote" \ No newline at end of file From 760e7eafaffa56dfbbcc57d9a68c4feee52feaa9 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun, 3 Nov 2024 08:19:20 +0000 Subject: [PATCH 03/16] Bubberstation automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-2311.yml | 4 ---- html/changelogs/AutoChangeLog-pr-2315.yml | 4 ---- html/changelogs/AutoChangeLog-pr-2316.yml | 4 ---- html/changelogs/AutoChangeLog-pr-2319.yml | 4 ---- html/changelogs/AutoChangeLog-pr-2320.yml | 4 ---- html/changelogs/archive/2024-11.yml | 10 ++++++++++ 6 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2311.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2315.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2316.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2319.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2320.yml diff --git a/html/changelogs/AutoChangeLog-pr-2311.yml b/html/changelogs/AutoChangeLog-pr-2311.yml deleted file mode 100644 index dc6ea511a24e4..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2311.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Kingsley-95" -delete-after: True -changes: - - rscadd: "Black-Backed Jackal tail" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2315.yml b/html/changelogs/AutoChangeLog-pr-2315.yml deleted file mode 100644 index ea91a6d55e4cf..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2315.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - qol: "Map vote results only include choices included in the vote" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2316.yml b/html/changelogs/AutoChangeLog-pr-2316.yml deleted file mode 100644 index c45d436d311d0..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2316.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TealSeer" -delete-after: True -changes: - - config: "Removed config entries for archived maps" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2319.yml b/html/changelogs/AutoChangeLog-pr-2319.yml deleted file mode 100644 index c04f2bfab3112..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2319.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TealSeer" -delete-after: True -changes: - - bugfix: "find_and_buy_event_from_track should no longer randomly fail." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2320.yml b/html/changelogs/AutoChangeLog-pr-2320.yml deleted file mode 100644 index 53fd7fdf60fdc..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2320.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "xPokee" -delete-after: True -changes: - - qol: "you can now toggle seeing end credits in preferences" \ No newline at end of file diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index 9ba8283f1f499..8700252c4fcf6 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -8,3 +8,13 @@ 2024-11-02: Jinshee: - rscadd: New gecko tail! +2024-11-03: + Kingsley-95: + - rscadd: Black-Backed Jackal tail + 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. + xPokee: + - qol: you can now toggle seeing end credits in preferences From 0353128da7f94a62bb32824fa2700d82cf846a88 Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:25:19 +0100 Subject: [PATCH 04/16] Fixes the hemophage tumor organs showing up wrong on med analyzers (#2325) ## About The Pull Request See name ## Why It's Good For The Game Fix gud ## Proof Of Testing Trust me bro ## Changelog :cl: fix: Hemophage organs no longer show up on analyzers /:cl: Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> --- .../living/carbon/human/species/hemophage/_hemophage_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 59217f2d068213e694b35d8ece0dac5dff98cbf5 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:34:37 +0100 Subject: [PATCH 05/16] Automatic changelog for PR #2325 [ci skip] --- html/changelogs/AutoChangeLog-pr-2325.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2325.yml 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 From 67d31b053572ab7bf664aaa6f2b9e8929d548c04 Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:21:12 +0100 Subject: [PATCH 06/16] Makes screenshots run based only on data and not tests (I think) (#2332) CI thing --- .github/workflows/ci_suite.yml | 2 +- ...shot_humanoids__datum_species_shadekin.png | Bin 1433 -> 1430 bytes .../screenshots/screenshot_husk_body.png | Bin 835 -> 835 bytes .../screenshot_husk_body_missing_limbs.png | Bin 786 -> 786 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 41aca0ccced74..8c37b412535a8 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -226,7 +226,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/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png index e90c493bfc4a553f244f8ddc784f4384b0648084..2224c3bdab9bcb83940b026ff98f52f633f6b905 100644 GIT binary patch delta 662 zcmV;H0%`r33ziG8G64ZkvoitV0e@ojB{4SR187H-ZXGRa_6<)wj*7^IdU+?D& zyPWAsmS4^TKVPz(eZ0Sae0;Lc4|?){IG2(RM`m(1VoDkuTWfD^St)UUx_?j=z7qbg zyJ*;V`DM&~>BfAO@b_=tvXaJrqV5(b*_ z=YyAY!i~`k%{|9p{vCS$dQWAeMYkOEF=z#7Arhgf=EJdMsa7FxY;$RY4dhg+&F;AP}g4O#ze;27&n@kbn78KMl780BHyDKXDfeFzz9S(S=lL>gvt^>1eD|{ zZsrdPF>y(&%W_JFh<_=Kq;^`|Cs0spl}MV($A%1CS98zq6JQ>Tr5NUoVgD6=R-#RC zeXoG#3FP|AxY4 woFTRr&~Wg%hCinnVm(IlUl*8WgzNYZ3NvW}iFK9000000Ne4wvM6N<$f_6qWLjV8( delta 665 zcmV;K0%rY|3z-YBG64ZnvoitV0e`aeC9yW+187H-Zg%{j=U99u-`RC6wqlfbfFJLF@{QcLj z_w$8a&h#Y9FXw@uFImn$-rqkyKH297J^4SJOG$?#GdUYEB@K?PwYRpclz+HCU8o9Q z3IEq!H0-w-Og1B z1I_sJ!ArVf%x>d2ci_04q|bVz(@s5@-J@MqkdHfq;Ry?Kw5}Z&PsZ-;+9r6pAEqPj z>SagrUSKeJRzrok0fvoJ4u1r=^HR(w3|$oN@W%YJ!~~Enkir4tDzLYMD~iR0!O*c& z%y`aq0LO&po?|fo4n2Rpr?Sza+ZHCDQ9wR?yAN9ml#jOEHW>x@Zi{Xf5{aw{Q1ZB_ zTTCfrTVN^TBQ^v=8xt8lmM<$9Y(LzpAdHj3qJm}+2voqP07?jhz<>M@$o#3FhFb!G zR&~osj?6z{guN|*nK#jlFo!sngudcYVa}I^P}rkKCrQgQL`$n$%mv;ZkFR-OLHO6> zk=DGl656_zr0Cq1y^sFyTuk)4qxxMaH9}jF@6n92l|Lz91R|TP?37GGWr-gG zO7avp^9O~PxTMu(Ie#TX#FR!-J1y=LD5$kcBu(XGLk6y^xo7tYFptGj4D-gY{|Y}V z(I&XQS3q+H0}zyn_k=kd=uPw~K3)2RmUP(?xS%0T%r0e_nQ`sT6~dkdV3v!+trb;EjQwm;iKv B4`l!V 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 aff3f07f97e6c8892889459162be76ee05e71b00..dff1f89549f4a4d0173416a46c7a8a85d1ef4549 100644 GIT binary patch delta 45 zcmV+|0Mh@G29gGlFCt<90H&sP5zLEn2!?I<|I@($j7#QZwn>%r0e_nQ`sT6~dkdV3v!+trb;EjO?nE+!) B4$=Ss From c27af5b1ba2b29396549be035970a6878ec375c6 Mon Sep 17 00:00:00 2001 From: sippykot Date: Mon, 4 Nov 2024 19:50:07 +0100 Subject: [PATCH 07/16] Cuts down borg untipping timer (#2312) ## About The Pull Request Edits the time it takes for the borg to un-tip themselves ## Why It's Good For The Game Borg tipping is explicitly a /tg/ salt PR designed to make the game worse for silicon players: https://github.com/tgstation/tgstation/pull/64097 (They even drew deranged little comics to support it, and put "i hate silicon" in "why it's good for the game" section lol) We have it reduced from **AN ENTIRE MINUTE** to 20 sec... which is still a ridiculously long stun. Reducing it to 3sec (the same time it takes to tip the borg over) makes it more of a silly/annoying little thing than a way to grief. ## Proof Of Testing I compiled it. ## Changelog :cl: balance: borg self un-tip time reduced to 3sec from 20sec /:cl: --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From 1ccf238e20e7c451d29b111215bd00e5cf17da58 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 19:50:33 +0100 Subject: [PATCH 08/16] Automatic changelog for PR #2312 [ci skip] --- html/changelogs/AutoChangeLog-pr-2312.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2312.yml 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 From d82ab5e4d36dcf9110a4e8b558de277d505e7471 Mon Sep 17 00:00:00 2001 From: Otome Date: Mon, 4 Nov 2024 13:05:27 -0600 Subject: [PATCH 09/16] Roselia's Small Fixes and Changes Part 2 (#2328) ## About The Pull Request Small map edits of previous PRs of mine that don't need PRs of their own. - The Interlink Administrative Office now has: a photocopier, a boozeomat and beer dispenser, a commandrobe, an actual pet in the form of Pengy The Mighty Empress Penguin, a couple folders, a feather (cause you're fancy), and a chalkboard. A single camera has been added (on the secret network) so holopad calls can see the interior of the room, and for AIs to verify the identity of any occupants. - Lizard Gas stations all around now stock the fabled Gas Station Sushi (but it's edible and not spiked). The pipe gun has also been replaced with a much more reliable (or unreliable since they're used against fauna) laser musket. The weird double-wall bathroom is now single wall since I finally figured out how to have vending machines in the walls properly. ## Why It's Good For The Game Cause some stuff needs adjustments or fixing to feel more proper, or be less obtuse. ## Proof Of Testing It's just map edits of already working maps. No code changes. It'll work. ## Changelog :cl: 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. /:cl: --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> --- .../icemoon_surface_gas_bubber.dmm | 66 ++++--- .../lavaland_surface_gas_bubber.dmm | 64 ++++--- .../bubberstation/thelizardsgas_bubber.dmm | 66 ++++--- .../generic/interlink_adminoffice.dmm | 181 +++++++++++++----- 4 files changed, 243 insertions(+), 134 deletions(-) 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/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 From 930df3637ecbc2de4951fbb9e3984751789f7a82 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:06:30 +0100 Subject: [PATCH 10/16] Automatic changelog for PR #2328 [ci skip] --- html/changelogs/AutoChangeLog-pr-2328.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2328.yml 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 From 3b8e4f9fbaacde0fa216434c6c8d06d7457dfb79 Mon Sep 17 00:00:00 2001 From: LT3 <83487515+lessthnthree@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:23:23 -0800 Subject: [PATCH 11/16] Adds a 2nd Skillsoft to the Ghost Cafe (#2322) ## About The Pull Request Adds a second Skillsoft machine to the Ghost Cafe in the vending machines area ## Why It's Good For The Game The one over in the abductor themed area is far, and the space is potentially in use. ## Proof Of Testing
Screenshots/Videos ![image](https://github.com/user-attachments/assets/fc91e450-de91-4732-aab3-9e582afe03e2)
## Changelog :cl: LT3 add: Added a Skillsoft machine to the Ghost Cafe vending area /:cl: --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 From 214abafed95aed09e52eb74173c41a701b821850 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:24:41 +0100 Subject: [PATCH 12/16] Automatic changelog for PR #2322 [ci skip] --- html/changelogs/AutoChangeLog-pr-2322.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2322.yml 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 From fd1d021b1558f79e95e6e6728ca9cf99502b1fcc Mon Sep 17 00:00:00 2001 From: Alexis Date: Mon, 4 Nov 2024 14:53:46 -0500 Subject: [PATCH 13/16] (PORT) Closet/Crate Examining for Observers (#2318) ## About The Pull Request _**PORTED FROM FALLOUT 13 - I COULD NOT FIND THE EXACT PR IT WAS ADDED IN**_ Lets ghosts click on lockers and crates to see what is inside of them. ## Why It's Good For The Game It helps admins out in two ways, one, they don't have to VV to see what is inside of things, and two, they won't be asked by players to see what is inside of crates or lockers. ## Proof Of Testing It didn't runtime or have any errors when I locally tested it, screenshots of it in action can be found below.
Screenshots/Videos ![image](https://github.com/user-attachments/assets/a95bdcf0-ca23-4977-a9be-26789037062f) ![image](https://github.com/user-attachments/assets/115bcd94-fdf0-482f-b5c1-3c57df9006a3)
## Changelog :cl: qol: made it so you can examine what is inside of crates and lockers as an observer /:cl: --- .../code/game/objects/structures/crates_lockers/closets.dm | 4 ++++ tgstation.dme | 1 + 2 files changed, 5 insertions(+) create mode 100644 modular_zubbers/code/game/objects/structures/crates_lockers/closets.dm 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 5265622452f72..5c7d664ce4ea6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8786,6 +8786,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" From 10af6fc0bb93aef13631124def9dfe6f53ba5a1f Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:07:32 +0100 Subject: [PATCH 14/16] Automatic changelog for PR #2318 [ci skip] --- html/changelogs/AutoChangeLog-pr-2318.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2318.yml 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 From 76cd49b580df7cf128ede8079120f9c6c01cdee7 Mon Sep 17 00:00:00 2001 From: LT3 <83487515+lessthnthree@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:35:31 -0800 Subject: [PATCH 15/16] Remove Northstar, Wawastation, Birdshot from CI (#2333) ## About The Pull Request We don't run these maps, they're already removed from basemap.dm ## Changelog :cl: LT3 server: Removed Northstar, Wawastation, and Birdshot from map configuration cache /:cl: Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- _maps/birdshot.json | 17 ----------------- _maps/northstar.json | 38 -------------------------------------- _maps/wawastation.json | 32 -------------------------------- 3 files changed, 87 deletions(-) delete mode 100644 _maps/birdshot.json delete mode 100644 _maps/northstar.json delete mode 100644 _maps/wawastation.json 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/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" - } - } -} From 3f8a707a983cbe692ccb5afa7d4faac2d063e6ac Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:51:11 +0100 Subject: [PATCH 16/16] Automatic changelog for PR #2333 [ci skip] --- html/changelogs/AutoChangeLog-pr-2333.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2333.yml 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