From cc1ba1d2df4d6ccb8892ba91c08b0a33e734f1e6 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:58:38 +0300 Subject: [PATCH 01/83] Fixes spotlight breaking every time (#6184) # About the pull request Spotlight no longer turns off during transit. Who cares about lighting in space anyway? # Explain why it's good for the game Convenient and clear. # Testing Photographs and Procedure
I tested it
# Changelog :cl: ihatethisengine fix: spotlight no longer breaks after every flight /:cl: --- code/modules/cm_marines/dropship_equipment.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index bd40076ea500..af06f468adcd 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -524,12 +524,6 @@ if(light_on) set_light(0) -/obj/structure/dropship_equipment/electronics/spotlights/on_launch() - set_light(0) - -/obj/structure/dropship_equipment/electronics/spotlights/on_arrival() - set_light(brightness) - /obj/structure/dropship_equipment/electronics/spotlights/ui_data(mob/user) . = list() var/is_deployed = light_on From e58c905d8a78dbde9d71639c864c64070c2c905c Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:03:04 +0100 Subject: [PATCH 02/83] Automatic changelog for PR #6184 [ci skip] --- html/changelogs/AutoChangeLog-pr-6184.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6184.yml diff --git a/html/changelogs/AutoChangeLog-pr-6184.yml b/html/changelogs/AutoChangeLog-pr-6184.yml new file mode 100644 index 000000000000..ed42d160bdee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6184.yml @@ -0,0 +1,4 @@ +author: "ihatethisengine" +delete-after: True +changes: + - bugfix: "spotlight no longer breaks after every flight" \ No newline at end of file From 6bec1ddce6470251ee61b628c51e76c3d5e52bf8 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:50:38 +0100 Subject: [PATCH 03/83] Project ARES: Fixes deleting flight logs. (#6186) # About the pull request As title says, this lets you delete flight logs as intended. # Explain why it's good for the game Bugs are bad. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: You can delete flight logs from ARES Interface again as intended. /:cl: --- code/game/machinery/ARES/ARES_interface.dm | 4 ++++ tgui/packages/tgui/interfaces/AresInterface.jsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 6cc7c220fd04..341e6a05acf4 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -368,6 +368,10 @@ new_title = "[record.title] at [record.time]" new_details = record.details datacore.records_tech -= record + if(ARES_RECORD_FLIGHT) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_flight -= record new_delete.details = new_details new_delete.user = last_login diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index be9106e31c25..bcd200d45d74 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -66,7 +66,7 @@ const Login = (props) => { WY-DOS Executive - Version 8.2.3 + Version 8.3.4 Copyright © 2182, Weyland Yutani Corp.