From 9d6826cfca155f055d1616ed287aaebe9196aae9 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sat, 25 May 2024 14:38:41 +0100 Subject: [PATCH 1/8] Project ARES: Almayer Sentries (#6268) # About the pull request Changes the sprites for the sentry deployment systems aboard the USS Almayer to use a custom floor based holder, rather than a floating wall mount. Also adds mini sentry deployers, along with an AI-Core subtype that autodeploys on lockdown. # Explain why it's good for the game Currently the sentry deployment system sprites are designed as if they're mounted to walls, and they usually are, but on the Almayer they're essentially floating next to the fuel pumps. This changes that. Also it allows the AI Core to be protected from xenos without subjecting non-existant joes to melee combat. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/cmss13-devs/cmss13/assets/41653574/a4a671a2-2772-4c13-8f84-c11cf3bd807b) ![image](https://github.com/cmss13-devs/cmss13/assets/41653574/61f83c72-aa40-4a9b-b528-8fd86b4df5f5)
# Changelog :cl: imageadd: added sprites for floor-mounted sentry deployment systems. add: Added mini-sentry deployment systems, and an AI Core subtype. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/sentry_holder.dm | 40 +++++++++++++++---- code/modules/defenses/sentry.dm | 19 ++++++++- icons/obj/structures/props/almayer_props.dmi | Bin 39823 -> 40781 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 10 ++++- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/sentry_holder.dm b/code/game/machinery/sentry_holder.dm index fe676e9103d2..255e718f40b8 100644 --- a/code/game/machinery/sentry_holder.dm +++ b/code/game/machinery/sentry_holder.dm @@ -16,6 +16,7 @@ var/ox = 0 var/oy = 0 var/require_red_alert = FALSE + var/base_icon_state = "sentry_system" /obj/structure/machinery/sentry_holder/Initialize() . = ..() @@ -76,13 +77,14 @@ deployment_cooldown = world.time + 50 deployed_turret.turned_on = TRUE deployed_turret.forceMove(loc) - icon_state = "sentry_system_deployed" + icon_state = "[base_icon_state]_deployed" - for(var/mob/M in deployed_turret.loc) - if(deployed_turret.loc == src.loc) - step(M, deployed_turret.dir) - else - step(M, get_dir(src,deployed_turret)) + if(deployed_turret.density) + for(var/mob/blocking_mob in deployed_turret.loc) + if(deployed_turret.loc == loc) + step(blocking_mob, deployed_turret.dir) + else + step(blocking_mob, get_dir(src, deployed_turret)) deployed_turret.setDir(dir) deployed_turret.pixel_x = 0 @@ -103,7 +105,7 @@ deployed_turret.unset_range() pixel_x = ox pixel_y = oy - icon_state = "sentry_system_installed" + icon_state = "[base_icon_state]_installed" /obj/structure/machinery/sentry_holder/Destroy() QDEL_NULL(deployed_turret) @@ -115,5 +117,29 @@ turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/colony /obj/structure/machinery/sentry_holder/almayer + icon_state = "floor_sentry_installed" turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer + base_icon_state = "floor_sentry" require_red_alert = TRUE + +/obj/structure/machinery/sentry_holder/almayer/mini + turret_path = /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini + +/obj/structure/machinery/sentry_holder/almayer/mini/aicore + +/obj/structure/machinery/sentry_holder/almayer/mini/aicore/Initialize() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(auto_deploy)) + RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(undeploy_sentry)) + +/obj/structure/machinery/sentry_holder/almayer/mini/aicore/proc/auto_deploy() + if(deployed_turret.loc == src) //not deployed + if(stat & NOPOWER) + return FALSE + + deploy_sentry() + return TRUE + +/obj/structure/machinery/sentry_holder/almayer/mini/aicore/attack_hand(mob/user) + to_chat(user, SPAN_WARNING("[src] can only be deployed remotely.")) + return diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 954e6adca7ec..543dfcefe5bc 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -527,9 +527,26 @@ selected_categories[SENTRY_CATEGORY_IFF] = FACTION_COLONY /obj/structure/machinery/defenses/sentry/premade/deployable/almayer - fire_delay = 4 + name = "UA-635C Static Gauss Turret" + desc = "A fully-automated defence turret with mid-range targeting capabilities. Armed with a modified M32-S Autocannon and an internal belt feed and modified for UA warship use." + fire_delay = 0.4 SECONDS omni_directional = TRUE +/obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini + name = "UA 512-S mini sentry" + desc = "A fully-automated defence turret with mid-range targeting capabilities. Armed with a modified M30 Autocannon and an internal belt feed and modified for UA warship use." + defense_type = "Mini" + fire_delay = 0.25 SECONDS + health = 150 + health_max = 150 + damage_mult = 0.6 + density = FALSE + layer = BELOW_MOB_LAYER + disassemble_time = 0.75 SECONDS + handheld_type = /obj/item/defenses/handheld/sentry/mini + composite_icon = FALSE + + //the turret inside the shuttle sentry deployment system /obj/structure/machinery/defenses/sentry/premade/dropship density = TRUE diff --git a/icons/obj/structures/props/almayer_props.dmi b/icons/obj/structures/props/almayer_props.dmi index e928213f8f30118a92bd5913744da3b9494241fd..013a542941a10e053136b26afecd6c8fcd957a7c 100644 GIT binary patch delta 18539 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 TcEQA500000NkvXXu0mjfOcPUO delta 17554 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 $ISZPWUJzCJU?0zB0z?(b(}5!7!$?yqUR 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 bQ0M;x0AmpfS}<

Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: lifeboats now come stocked with uno cards, for all your fun-filled needs /:cl: --------- Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> --- code/game/machinery/vending/vendor_types/supplies.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/supplies.dm b/code/game/machinery/vending/vendor_types/supplies.dm index 376edf7ffc5d..a363e2e03f64 100644 --- a/code/game/machinery/vending/vendor_types/supplies.dm +++ b/code/game/machinery/vending/vendor_types/supplies.dm @@ -28,6 +28,7 @@ list("M94 Marking Flare Pack", 5, /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR), list("M5 Bayonet", 8, /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR), list("Handheld Radio", 5, /obj/item/device/radio, VENDOR_ITEM_REGULAR), + list("deck of UNO cards", 5, /obj/item/toy/deck/uno, VENDOR_ITEM_REGULAR), list("CLOTHING", -1, null, null), list("Gas Mask", 15, /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR), From 7c476f886422b76a891a8bf378f560fb6f1aa8f0 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 26 May 2024 09:55:39 +0100 Subject: [PATCH 7/8] Automatic changelog for PR #6326 [ci skip] --- html/changelogs/AutoChangeLog-pr-6326.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6326.yml diff --git a/html/changelogs/AutoChangeLog-pr-6326.yml b/html/changelogs/AutoChangeLog-pr-6326.yml new file mode 100644 index 000000000000..24c6a9e12d26 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6326.yml @@ -0,0 +1,4 @@ +author: "neeshacark" +delete-after: True +changes: + - rscadd: "lifeboats now come stocked with uno cards, for all your fun-filled needs" \ No newline at end of file From 2dfa7a56459c63607291f5be72488a0cf4d7ab4c Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 27 May 2024 01:14:50 +0000 Subject: [PATCH 8/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6326.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6332.yml | 4 ---- html/changelogs/archive/2024-05.yml | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6326.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6332.yml diff --git a/html/changelogs/AutoChangeLog-pr-6326.yml b/html/changelogs/AutoChangeLog-pr-6326.yml deleted file mode 100644 index 24c6a9e12d26..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6326.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "neeshacark" -delete-after: True -changes: - - rscadd: "lifeboats now come stocked with uno cards, for all your fun-filled needs" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6332.yml b/html/changelogs/AutoChangeLog-pr-6332.yml deleted file mode 100644 index 96386fc3df62..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6332.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vero5123" -delete-after: True -changes: - - bugfix: "Fixes non-synthetic mobs getting stuck in the gibber" \ No newline at end of file diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index e96ae8df5ba3..b3de5e9ecdd0 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -300,3 +300,8 @@ realforest2001: - imageadd: added sprites for floor-mounted sentry deployment systems. - rscadd: Added mini-sentry deployment systems, and an AI Core subtype. +2024-05-27: + neeshacark: + - rscadd: lifeboats now come stocked with uno cards, for all your fun-filled needs + vero5123: + - bugfix: Fixes non-synthetic mobs getting stuck in the gibber