From 2f58b2bf1f672f58d3bf2e1e10b388b0558167ce Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 9 Dec 2023 01:10:38 +0000 Subject: [PATCH 01/16] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5088.yml | 7 ------- html/changelogs/AutoChangeLog-pr-5154.yml | 6 ------ html/changelogs/AutoChangeLog-pr-5159.yml | 4 ---- html/changelogs/archive/2023-12.yml | 16 ++++++++++++++++ 4 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5088.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5154.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5159.yml diff --git a/html/changelogs/AutoChangeLog-pr-5088.yml b/html/changelogs/AutoChangeLog-pr-5088.yml deleted file mode 100644 index 8634312a2441..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5088.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "zzzmike" -delete-after: True -changes: - - spellcheck: "tablestun text is more clear that it stuns" - - soundadd: "unequip noise added to uniform, backpack, shoes." - - soundadd: "sound added to tablestun" - - sounddel: "for disarms, whoosh only triggers on stun. otherwise, the miss sound plays" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5154.yml b/html/changelogs/AutoChangeLog-pr-5154.yml deleted file mode 100644 index 4e8d9ab03703..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5154.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "InsaneRed" -delete-after: True -changes: - - balance: "Oppressor tail abduct changed to 15 seconds and lowers the windup to 7 deciseconds" - - balance: " Changes around the punch effect so that instead of having to meet demonic standards, you only need to punch to lower your tail/hook on oppressor." - - bugfix: "You will now automatically punch chest if the target you are aiming at is delimbed instead of doing nothing" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5159.yml b/html/changelogs/AutoChangeLog-pr-5159.yml deleted file mode 100644 index b7fe3f219b02..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5159.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - rscdel: "removes a nanoui debug verb that no one has ever used, ever" \ No newline at end of file diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml index bbc0878d8e43..582bfeec8138 100644 --- a/html/changelogs/archive/2023-12.yml +++ b/html/changelogs/archive/2023-12.yml @@ -177,3 +177,19 @@ - balance: PO can remove queens dropship override again. private-tristan: - qol: Gun safety messages now use balloon alerts. +2023-12-09: + InsaneRed: + - balance: Oppressor tail abduct changed to 15 seconds and lowers the windup to + 7 deciseconds + - balance: ' Changes around the punch effect so that instead of having to meet demonic + standards, you only need to punch to lower your tail/hook on oppressor.' + - bugfix: You will now automatically punch chest if the target you are aiming at + is delimbed instead of doing nothing + harryob: + - rscdel: removes a nanoui debug verb that no one has ever used, ever + zzzmike: + - spellcheck: tablestun text is more clear that it stuns + - soundadd: unequip noise added to uniform, backpack, shoes. + - soundadd: sound added to tablestun + - sounddel: for disarms, whoosh only triggers on stun. otherwise, the miss sound + plays From d3f68272218aeee7dadf41067abd5b2d5f675412 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 9 Dec 2023 10:10:35 +0000 Subject: [PATCH 02/16] Removes the welder deconstruction hint from resin walls (#5163) # About the pull request Adds a check to `/turf/closed/wall/get_examine_text()` to remove the deconstruction hint for anything with the `TURF_ORGANIC` flag (currently only resin walls). # Explain why it's good for the game Given that resin walls/membranes can't actually be deconstructed with tools, it doesn't make much sense to show that message. # Testing Photographs and Procedure
Screenshots & Videos **Before:** ![old](https://github.com/cmss13-devs/cmss13/assets/57483089/d2f1b351-5abd-4cb6-acb9-4d6e44c10a31) **After:** ![new](https://github.com/cmss13-devs/cmss13/assets/57483089/5b234399-7f84-473e-9c5e-83f3c56eb808)
# Changelog :cl: fix: Fixed resin walls/membranes showing a welder deconstruction hint. /:cl: --- code/game/turfs/walls/walls.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index 6ef0ffbdfec8..77143384e7e7 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -170,6 +170,9 @@ if (acided_hole) . += SPAN_WARNING("There's a large hole in the wall that could've been caused by some sort of acid.") + if(flags_turf & TURF_ORGANIC) + return // Skip the part below. 'Organic' walls aren't deconstructable with tools. + switch(d_state) if(WALL_STATE_WELD) . += SPAN_INFO("The outer plating is intact. A blowtorch should slice it open.") From 0e7c1d40c5691c82c8422828810829f13de17e5a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 9 Dec 2023 10:18:39 +0000 Subject: [PATCH 03/16] Automatic changelog for PR #5163 [ci skip] --- html/changelogs/AutoChangeLog-pr-5163.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5163.yml diff --git a/html/changelogs/AutoChangeLog-pr-5163.yml b/html/changelogs/AutoChangeLog-pr-5163.yml new file mode 100644 index 000000000000..b63040d9f871 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5163.yml @@ -0,0 +1,4 @@ +author: "SabreML" +delete-after: True +changes: + - bugfix: "Fixed resin walls/membranes showing a welder deconstruction hint." \ No newline at end of file From 2d08825f5766feda0ea3306e5c5f16d74794e3c8 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 9 Dec 2023 10:10:46 +0000 Subject: [PATCH 04/16] Resting now cancels xenomorph Evolve again (#5162) # About the pull request Resting once again cancels xenomorph evolve.. nb. You can also resist to do the same. # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Resting once again cancels xenomorph evolve. /:cl: --- code/modules/mob/living/carbon/xenomorph/Evolution.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index af6be8265cc0..49d73e71a241 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -105,8 +105,8 @@ evolving = TRUE var/level_to_switch_to = get_vision_level() - if(!do_after(src, 2.5 SECONDS, INTERRUPT_INCAPACITATED, BUSY_ICON_HOSTILE)) // Can evolve while moving - to_chat(src, SPAN_WARNING("You quiver, but nothing happens. Hold still while evolving.")) + if(!do_after(src, 2.5 SECONDS, INTERRUPT_INCAPACITATED|INTERRUPT_CHANGED_LYING, BUSY_ICON_HOSTILE)) // Can evolve while moving, resist or rest to cancel it. + to_chat(src, SPAN_WARNING("You quiver, but nothing happens. Your evolution has ceased for now...")) evolving = FALSE return From b59dc1543003ef9a9c06a02851b5ccda3d62d8f6 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 9 Dec 2023 10:31:48 +0000 Subject: [PATCH 05/16] Automatic changelog for PR #5162 [ci skip] --- html/changelogs/AutoChangeLog-pr-5162.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5162.yml diff --git a/html/changelogs/AutoChangeLog-pr-5162.yml b/html/changelogs/AutoChangeLog-pr-5162.yml new file mode 100644 index 000000000000..3dbf6bbae368 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5162.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - bugfix: "Resting once again cancels xenomorph evolve." \ No newline at end of file From 4d5b052b1f7d028752018bb4805f7a0bf7f4d0fa Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Sat, 9 Dec 2023 15:45:21 +0300 Subject: [PATCH 06/16] Locking lifeboats open the docks (#5133) # About the pull request Locking lifeboats open the docks. # Explain why it's good for the game No more lifeboats getting stuck locked when queen hijacks during launch. # Testing Photographs and Procedure
I did test it... kinda Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: ihatethisengine add: locking lifeboats open the docks /:cl: --- code/modules/shuttle/computer.dm | 19 ++++++++++++++----- .../shuttle/shuttles/crashable/lifeboats.dm | 2 ++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index cad5458e80e1..79377d9c0849 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -343,14 +343,23 @@ if(lifeboat.status == LIFEBOAT_LOCKED) to_chat(xeno, SPAN_WARNING("We already wrested away control of this metal bird.")) return XENO_NO_DELAY_ACTION + if(lifeboat.mode == SHUTTLE_CALL) + to_chat(xeno, SPAN_WARNING("Too late, you cannot stop the metal bird mid-flight.")) + return XENO_NO_DELAY_ACTION xeno_attack_delay(xeno) if(do_after(usr, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - if(lifeboat.status != LIFEBOAT_LOCKED) - lifeboat.status = LIFEBOAT_LOCKED - lifeboat.available = FALSE - lifeboat.set_mode(SHUTTLE_IDLE) - xeno_message(SPAN_XENOANNOUNCE("We have wrested away control of one of the metal birds! They shall not escape!"), 3, xeno.hivenumber) + if(lifeboat.status == LIFEBOAT_LOCKED) + return XENO_NO_DELAY_ACTION + if(lifeboat.mode == SHUTTLE_CALL) + to_chat(xeno, SPAN_WARNING("Too late, you cannot stop the metal bird mid-flight.")) + return XENO_NO_DELAY_ACTION + lifeboat.status = LIFEBOAT_LOCKED + lifeboat.available = FALSE + lifeboat.set_mode(SHUTTLE_IDLE) + var/obj/docking_port/stationary/lifeboat_dock/lifeboat_dock = lifeboat.get_docked() + lifeboat_dock.open_dock() + xeno_message(SPAN_XENOANNOUNCE("We have wrested away control of one of the metal birds! They shall not escape!"), 3, xeno.hivenumber) return XENO_NO_DELAY_ACTION else return ..() diff --git a/code/modules/shuttle/shuttles/crashable/lifeboats.dm b/code/modules/shuttle/shuttles/crashable/lifeboats.dm index 25d1aeb6efb7..415a628be6e5 100644 --- a/code/modules/shuttle/shuttles/crashable/lifeboats.dm +++ b/code/modules/shuttle/shuttles/crashable/lifeboats.dm @@ -102,6 +102,8 @@ /obj/docking_port/stationary/lifeboat_dock/proc/close_dock() var/obj/docking_port/mobile/crashable/lifeboat/docked_shuttle = get_docked() + if(docked_shuttle.status == LIFEBOAT_LOCKED) + return if(docked_shuttle) for(var/obj/structure/machinery/door/airlock/multi_tile/door in docked_shuttle.doors) INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat, close_and_lock)) From c08b667abc11c8a67ed9048ed911a6c2ff135b51 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:53:11 +0000 Subject: [PATCH 07/16] Automatic changelog for PR #5133 [ci skip] --- html/changelogs/AutoChangeLog-pr-5133.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5133.yml diff --git a/html/changelogs/AutoChangeLog-pr-5133.yml b/html/changelogs/AutoChangeLog-pr-5133.yml new file mode 100644 index 000000000000..7d31dce64cde --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5133.yml @@ -0,0 +1,4 @@ +author: "ihatethisengine" +delete-after: True +changes: + - rscadd: "locking lifeboats open the docks" \ No newline at end of file From d6ba8c5acecfd2010b5bd517209258f62d08bf09 Mon Sep 17 00:00:00 2001 From: harryob Date: Sat, 9 Dec 2023 13:00:09 +0000 Subject: [PATCH 08/16] remove a tgs chat command warning, change tgs round restart order (#5148) ![CleanShot 2023-12-06 at 18 36 34@2x](https://github.com/cmss13-devs/cmss13/assets/55142896/22115e45-568c-4ea9-aef4-28111b93e57a) removes this tgs warning moves the restart notification to when a new round initialises instead of the end of the last round --- code/__HELPERS/chat.dm | 7 ++++--- code/controllers/subsystem/mapping.dm | 5 +++++ code/game/world.dm | 17 +++++++---------- code/modules/admin/chat_commands.dm | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/code/__HELPERS/chat.dm b/code/__HELPERS/chat.dm index f7382e151854..20d1a45b31cc 100644 --- a/code/__HELPERS/chat.dm +++ b/code/__HELPERS/chat.dm @@ -1,11 +1,12 @@ /** - * Sends a message to TGS chat channels. + * Asynchronously sends a message to TGS chat channels. * - * message - The message to send. + * message - The [/datum/tgs_message_content] to send. * channel_tag - Required. If "", the message with be sent to all connected (Game-type for TGS3) channels. Otherwise, it will be sent to TGS4 channels with that tag (Delimited by ','s). * admin_only - Determines if this communication can only be sent to admin only channels. */ -/proc/send2chat(message, channel_tag, admin_only = FALSE) +/proc/send2chat(datum/tgs_message_content/message, channel_tag, admin_only = FALSE) + set waitfor = FALSE if(channel_tag == null || !world.TgsAvailable()) return diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 913e5dcd50d3..0f4a63ff65e8 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -61,6 +61,11 @@ SUBSYSTEM_DEF(mapping) if(MC.perf_mode) GLOB.perf_flags |= MC.perf_mode + if(configs[GROUND_MAP]) + send2chat(new /datum/tgs_message_content("<@&[CONFIG_GET(string/new_round_alert_role_id)]> Round restarted! Map is [configs[GROUND_MAP].map_name]"), CONFIG_GET(string/new_round_alert_channel)) + else + send2chat(new /datum/tgs_message_content("<@&[CONFIG_GET(string/new_round_alert_role_id)]> Round started!"), CONFIG_GET(string/new_round_alert_channel)) + return SS_INIT_SUCCESS /datum/controller/subsystem/mapping/proc/wipe_reservations(wipe_safety_delay = 100) diff --git a/code/game/world.dm b/code/game/world.dm index d8156547ef76..f68263412715 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -247,16 +247,13 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) shutdown() /world/proc/send_tgs_restart() - if(CONFIG_GET(string/new_round_alert_channel) && CONFIG_GET(string/new_round_alert_role_id)) - if(GLOB.round_statistics) - send2chat("[GLOB.round_statistics.round_name][GLOB.round_id ? " (Round [GLOB.round_id])" : ""] completed!", CONFIG_GET(string/new_round_alert_channel)) - if(SSmapping.next_map_configs) - var/datum/map_config/next_map = SSmapping.next_map_configs[GROUND_MAP] - if(next_map) - send2chat("<@&[CONFIG_GET(string/new_round_alert_role_id)]> Restarting! Next map is [next_map.map_name]", CONFIG_GET(string/new_round_alert_channel)) - else - send2chat("<@&[CONFIG_GET(string/new_round_alert_role_id)]> Restarting!", CONFIG_GET(string/new_round_alert_channel)) - return + if(!CONFIG_GET(string/new_round_alert_channel)) + return + + if(!GLOB.round_statistics) + return + + send2chat(new /datum/tgs_message_content("[GLOB.round_statistics.round_name][GLOB.round_id ? " (Round [GLOB.round_id])" : ""] completed!"), CONFIG_GET(string/new_round_alert_channel)) /world/proc/send_reboot_sound() var/reboot_sound = SAFEPICK(GLOB.reboot_sfx) diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index 37ffcd114e91..c5036e7ca1f7 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -8,7 +8,7 @@ /datum/tgs_chat_command/sdql/Run(datum/tgs_chat_user/sender, params) var/list/results = HandleUserlessSDQL(sender.friendly_name, params) if(!results) - return "Query produced no output" + return new /datum/tgs_message_content("Query produced no output") var/list/text_res = results.Copy(1, 3) var/list/refs = length(results) > 3 ? results.Copy(4) : null - return "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]" + return new /datum/tgs_message_content("[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]") From 961d96720e5e8bc78ddbf927135de1c42bd4064f Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:22:32 -0800 Subject: [PATCH 09/16] Egg Changes (#5054) # About the pull request Now that https://github.com/cmss13-devs/cmss13/pull/4716 's been merged, here's the changes I've wanted to make for eggs for a bit now. - Eggs can no longer be planted in vehicles - Eggs can no longer be planted on tiles that would obstruct the egg. # Explain why it's good for the game - In the vast majority of cases, you cannot tell that a vehicle you're entering is infested with you-instantly-lose eggs. While normally getting hit with an egg is reasonably predictable (there are weeds == possibility of eggs), having no indication of it until you go inside and get hugged isn't fun or balanced. - Eggs being able to layer under things like grass is technically a "feature", but not one I would like to keep. Traps serve the exact same purpose, but are much harder to mass produce (as intended). Eggs should be cheaper but more detectable, which doesn't align them being able to be near-fully hidden. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/cmss13-devs/cmss13/assets/41448081/7151c503-72fa-4b1e-acba-576f556420c1)
# Changelog :cl: balance: You cannot plant eggs inside vehicles. balance: Eggs can no longer be planted on tiles with objects that would obscure them. /:cl: --- code/modules/cm_aliens/structures/egg.dm | 2 +- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index eda9803c8784..edb86c204558 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -8,7 +8,7 @@ icon_state = "Egg Growing" density = FALSE anchored = TRUE - layer = LYING_BETWEEN_MOB_LAYER //to stop hiding eggs under corpses + layer = LYING_BETWEEN_MOB_LAYER health = 80 plane = GAME_PLANE var/list/egg_triggers = list() diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index b9304b33b15a..e4cc7bd39fe0 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -102,6 +102,16 @@ to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return + if(istype(get_area(T), /area/vehicle)) + to_chat(user, SPAN_XENOWARNING("[src] cannot be planted inside a vehicle.")) + return + + for(var/obj/object in T.contents) + var/obj/effect/alien/egg/xeno_egg = /obj/effect/alien/egg + if(object.layer > initial(xeno_egg.layer)) + to_chat(user, SPAN_XENOWARNING("[src] cannot be planted below objects that would obscure it.")) + return + user.visible_message(SPAN_XENONOTICE("[user] starts planting [src]."), SPAN_XENONOTICE("You start planting [src]."), null, 5) var/plant_time = 35 From 36c1dfaec32fc7ea0963ef754a79effdeda32fec Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 9 Dec 2023 20:35:30 +0000 Subject: [PATCH 10/16] Automatic changelog for PR #5054 [ci skip] --- html/changelogs/AutoChangeLog-pr-5054.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5054.yml diff --git a/html/changelogs/AutoChangeLog-pr-5054.yml b/html/changelogs/AutoChangeLog-pr-5054.yml new file mode 100644 index 000000000000..bace41b79d17 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5054.yml @@ -0,0 +1,5 @@ +author: "Zonespace27" +delete-after: True +changes: + - balance: "You cannot plant eggs inside vehicles." + - balance: "Eggs can no longer be planted on tiles with objects that would obscure them." \ No newline at end of file From f8e06187a9061c0e64a7036a61b99eb721dff90c Mon Sep 17 00:00:00 2001 From: harryob Date: Sat, 9 Dec 2023 23:16:38 +0000 Subject: [PATCH 11/16] fixes is_interior(), fixing xeno construction on dropships during transport (#5158) huh? how'd this not get reported? :cl: fix: xenos can construct in dropships during transport again /:cl: --- code/controllers/subsystem/interior.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/interior.dm b/code/controllers/subsystem/interior.dm index 8fb7ffbfeee7..8abc3179f191 100644 --- a/code/controllers/subsystem/interior.dm +++ b/code/controllers/subsystem/interior.dm @@ -51,10 +51,16 @@ SUBSYSTEM_DEF(interior) if(!isturf(loc)) loc = get_turf(loc) - var/datum/weakref/reservation = SSmapping.used_turfs[loc] + var/datum/weakref/reservation_weakref = SSmapping.used_turfs[loc] + + if(!reservation_weakref) + return + + var/datum/turf_reservation/interior/reservation = reservation_weakref.resolve() if(!istype(reservation)) return FALSE + return TRUE #undef INTERIOR_BORDER_SIZE From 0a5ef4b78f1b8a8c9256c1d893f0ca0e83e165c1 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 9 Dec 2023 23:24:40 +0000 Subject: [PATCH 12/16] Automatic changelog for PR #5158 [ci skip] --- html/changelogs/AutoChangeLog-pr-5158.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5158.yml diff --git a/html/changelogs/AutoChangeLog-pr-5158.yml b/html/changelogs/AutoChangeLog-pr-5158.yml new file mode 100644 index 000000000000..fd9236527c71 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5158.yml @@ -0,0 +1,4 @@ +author: "harryob" +delete-after: True +changes: + - bugfix: "xenos can construct in dropships during transport again" \ No newline at end of file From 86b8b5d62d001ec72b3d50d5994c3df45adf2952 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 10 Dec 2023 01:16:29 +0000 Subject: [PATCH 13/16] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5054.yml | 5 ----- html/changelogs/AutoChangeLog-pr-5133.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5158.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5162.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5163.yml | 4 ---- html/changelogs/archive/2023-12.yml | 13 +++++++++++++ 6 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5054.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5133.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5158.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5162.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5163.yml diff --git a/html/changelogs/AutoChangeLog-pr-5054.yml b/html/changelogs/AutoChangeLog-pr-5054.yml deleted file mode 100644 index bace41b79d17..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5054.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Zonespace27" -delete-after: True -changes: - - balance: "You cannot plant eggs inside vehicles." - - balance: "Eggs can no longer be planted on tiles with objects that would obscure them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5133.yml b/html/changelogs/AutoChangeLog-pr-5133.yml deleted file mode 100644 index 7d31dce64cde..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5133.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ihatethisengine" -delete-after: True -changes: - - rscadd: "locking lifeboats open the docks" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5158.yml b/html/changelogs/AutoChangeLog-pr-5158.yml deleted file mode 100644 index fd9236527c71..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5158.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - bugfix: "xenos can construct in dropships during transport again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5162.yml b/html/changelogs/AutoChangeLog-pr-5162.yml deleted file mode 100644 index 3dbf6bbae368..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5162.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - bugfix: "Resting once again cancels xenomorph evolve." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5163.yml b/html/changelogs/AutoChangeLog-pr-5163.yml deleted file mode 100644 index b63040d9f871..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5163.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SabreML" -delete-after: True -changes: - - bugfix: "Fixed resin walls/membranes showing a welder deconstruction hint." \ No newline at end of file diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml index 582bfeec8138..c2ccedf32b56 100644 --- a/html/changelogs/archive/2023-12.yml +++ b/html/changelogs/archive/2023-12.yml @@ -193,3 +193,16 @@ - soundadd: sound added to tablestun - sounddel: for disarms, whoosh only triggers on stun. otherwise, the miss sound plays +2023-12-10: + Birdtalon: + - bugfix: Resting once again cancels xenomorph evolve. + SabreML: + - bugfix: Fixed resin walls/membranes showing a welder deconstruction hint. + Zonespace27: + - balance: You cannot plant eggs inside vehicles. + - balance: Eggs can no longer be planted on tiles with objects that would obscure + them. + harryob: + - bugfix: xenos can construct in dropships during transport again + ihatethisengine: + - rscadd: locking lifeboats open the docks From 3156094d416f0c54ad01a2270779aa7be6b87b2b Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Mon, 11 Dec 2023 00:37:33 +0300 Subject: [PATCH 14/16] Fusion reactor explosion handling (#5166) # About the pull request You cannot destroy fusion reactors with explosives. Explosions do disable overloading tho as a little feature. # Explain why it's good for the game Not only it causes bugs, reactors is an important objective and you should not be able to destroy them with HEDP. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: ihatethisengine fix: fusion reactors cannot be destroyed with explosions /:cl: --- code/game/machinery/fusion_engine.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm index d7c7cc4c7d18..0e5f8142c2be 100644 --- a/code/game/machinery/fusion_engine.dm +++ b/code/game/machinery/fusion_engine.dm @@ -356,6 +356,11 @@ else . += SPAN_INFO("There is no fuel cell in the receptacle.") +/obj/structure/machinery/power/fusion_engine/ex_act(severity) + if(overloaded && severity >= EXPLOSION_THRESHOLD_MLOW) + set_overloading(FALSE) + return + /obj/structure/machinery/power/fusion_engine/update_icon() switch(buildstate) if(0) From c22fb48b903cc5832e5c72071efc8e59ca31f221 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 10 Dec 2023 21:45:17 +0000 Subject: [PATCH 15/16] Automatic changelog for PR #5166 [ci skip] --- html/changelogs/AutoChangeLog-pr-5166.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5166.yml diff --git a/html/changelogs/AutoChangeLog-pr-5166.yml b/html/changelogs/AutoChangeLog-pr-5166.yml new file mode 100644 index 000000000000..91fd9bc76f0f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5166.yml @@ -0,0 +1,4 @@ +author: "ihatethisengine" +delete-after: True +changes: + - bugfix: "fusion reactors cannot be destroyed with explosions" \ No newline at end of file From 25d70dace98164e08254875e20be5f667ca93ace Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 11 Dec 2023 01:12:43 +0000 Subject: [PATCH 16/16] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5166.yml | 4 ---- html/changelogs/archive/2023-12.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5166.yml diff --git a/html/changelogs/AutoChangeLog-pr-5166.yml b/html/changelogs/AutoChangeLog-pr-5166.yml deleted file mode 100644 index 91fd9bc76f0f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5166.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ihatethisengine" -delete-after: True -changes: - - bugfix: "fusion reactors cannot be destroyed with explosions" \ No newline at end of file diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml index c2ccedf32b56..058edaa8a731 100644 --- a/html/changelogs/archive/2023-12.yml +++ b/html/changelogs/archive/2023-12.yml @@ -206,3 +206,6 @@ - bugfix: xenos can construct in dropships during transport again ihatethisengine: - rscadd: locking lifeboats open the docks +2023-12-11: + ihatethisengine: + - bugfix: fusion reactors cannot be destroyed with explosions