From e8708644ce6f5b8e274791407b44fa33b215e9ef Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 20 Jan 2024 13:09:54 +0000 Subject: [PATCH 1/8] Makes larvae and facehuggers able to use custom emotes (#5496) # About the pull request Makes larvae and facehuggers able to use custom emotes with the 'me' verb. (All other emotes still work the same as before.) (The code just being copy+pasted between the two castes isn't great, but I can't really think of a cleaner way of doing it.) # Explain why it's good for the game Larva RP is one of the most vital parts of 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: add: Made larvae and facehuggers able to use custom emotes. /:cl: --- .../mob/living/carbon/xenomorph/castes/Facehugger.dm | 6 ++++++ code/modules/mob/living/carbon/xenomorph/castes/Larva.dm | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index 32531e5325c6..7ce3a8750568 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -220,7 +220,13 @@ return /mob/living/carbon/xenomorph/facehugger/emote(act, m_type, message, intentional, force_silence) + // Custom emote + if(act == "me") + return ..() + + // Otherwise, ""roar""! playsound(loc, "alien_roar_larva", 15) + return TRUE /mob/living/carbon/xenomorph/facehugger/get_status_tab_items() . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 6d5c6699b929..f1c77e7fb757 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -157,7 +157,13 @@ return larva /mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence) + // Custom emote + if(act == "me") + return ..() + + // Otherwise, ""roar""! playsound(loc, "alien_roar_larva", 15) + return TRUE /mob/living/carbon/xenomorph/larva/is_xeno_grabbable() return TRUE From 61a765cc32c13c9659dbedb9d96f25109188e156 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Jan 2024 13:18:24 +0000 Subject: [PATCH 2/8] Automatic changelog for PR #5496 [ci skip] --- html/changelogs/AutoChangeLog-pr-5496.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5496.yml diff --git a/html/changelogs/AutoChangeLog-pr-5496.yml b/html/changelogs/AutoChangeLog-pr-5496.yml new file mode 100644 index 000000000000..3042d1a9b813 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5496.yml @@ -0,0 +1,4 @@ +author: "SabreML" +delete-after: True +changes: + - rscadd: "Made larvae and facehuggers able to use custom emotes." \ No newline at end of file From 6631233f9346ea52d169849dce8a0c45d6e7a2ee Mon Sep 17 00:00:00 2001 From: Vicacrov <49321394+Vicacrov@users.noreply.github.com> Date: Sat, 20 Jan 2024 14:10:14 +0100 Subject: [PATCH 3/8] Fixes wrong dropship attachment planes (#5495) # About the pull request Fixes #5494 that I broke with #5475 sorry # Explain why it's good for the game You can attach engines/weapons to the dropships again _and_ not have xeno structures layer below the floor attach points. # Testing Photographs and Procedure 1. Attach various equipment to the dropships 2. See if they show up 3. Spawn xeno structures on the floor attach points see screenshots below
Screenshots & Videos ![image](https://github.com/cmss13-devs/cmss13/assets/49321394/0d7344f2-0e38-4955-b8c2-3394dd1eb197) ![image](https://github.com/cmss13-devs/cmss13/assets/49321394/2a8dc816-58db-478b-825d-81b78efaf80d) ![image](https://github.com/cmss13-devs/cmss13/assets/49321394/e45e6d91-2b74-4e83-9457-9d90501bcad7) ![image](https://github.com/cmss13-devs/cmss13/assets/49321394/7f4e4ddf-a509-49f6-90fb-6d3009905334)
# Changelog :cl: fix: Fixes engine/weapon attach points layering below the dropship walls. /:cl: --- code/modules/dropships/attach_points/attach_point.dm | 2 +- code/modules/dropships/attach_points/templates.dm | 6 ++++++ maps/shuttles/dropship_alamo.dmm | 6 +++--- maps/shuttles/dropship_normandy.dmm | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/dropships/attach_points/attach_point.dm b/code/modules/dropships/attach_points/attach_point.dm index 16c89cf164f2..7230e67e0af1 100644 --- a/code/modules/dropships/attach_points/attach_point.dm +++ b/code/modules/dropships/attach_points/attach_point.dm @@ -7,7 +7,7 @@ unacidable = TRUE anchored = TRUE layer = ABOVE_TURF_LAYER - plane = FLOOR_PLANE + plane = GAME_PLANE /// The currently installed equipment, if any var/obj/structure/dropship_equipment/installed_equipment /// What kind of equipment this base accepts diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm index 51c870f04b0b..bcdad8836e25 100644 --- a/code/modules/dropships/attach_points/templates.dm +++ b/code/modules/dropships/attach_points/templates.dm @@ -87,9 +87,15 @@ /obj/effect/attach_point/crew_weapon/dropship1 ship_tag = DROPSHIP_ALAMO +/obj/effect/attach_point/crew_weapon/dropship1/floor + plane = FLOOR_PLANE + /obj/effect/attach_point/crew_weapon/dropship2 ship_tag = DROPSHIP_NORMANDY +/obj/effect/attach_point/crew_weapon/dropship2/floor + plane = FLOOR_PLANE + /obj/effect/attach_point/electronics name = "electronic system attach point" base_category = DROPSHIP_ELECTRONICS diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index 1e78347c1721..d23036afdea3 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -416,7 +416,7 @@ }, /area/shuttle/drop1/sulaco) "Kk" = ( -/obj/effect/attach_point/crew_weapon/dropship1{ +/obj/effect/attach_point/crew_weapon/dropship1/floor{ attach_id = 7 }, /turf/open/shuttle/dropship{ @@ -450,7 +450,7 @@ }, /area/shuttle/drop1/sulaco) "Nv" = ( -/obj/effect/attach_point/crew_weapon/dropship1{ +/obj/effect/attach_point/crew_weapon/dropship1/floor{ attach_id = 8 }, /turf/open/shuttle/dropship{ @@ -507,7 +507,7 @@ }, /area/shuttle/drop1/sulaco) "PV" = ( -/obj/effect/attach_point/crew_weapon/dropship1{ +/obj/effect/attach_point/crew_weapon/dropship1/floor{ attach_id = 9 }, /turf/open/shuttle/dropship{ diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index 5a733f6a9e9b..e64fbe62372d 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -96,7 +96,7 @@ }, /area/shuttle/drop2/sulaco) "hn" = ( -/obj/effect/attach_point/crew_weapon/dropship2{ +/obj/effect/attach_point/crew_weapon/dropship2/floor{ attach_id = 8 }, /turf/open/shuttle/dropship{ @@ -326,7 +326,7 @@ }, /area/shuttle/drop2/sulaco) "Bg" = ( -/obj/effect/attach_point/crew_weapon/dropship2{ +/obj/effect/attach_point/crew_weapon/dropship2/floor{ attach_id = 7 }, /turf/open/shuttle/dropship{ @@ -478,7 +478,7 @@ /turf/template_noop, /area/shuttle/drop2/sulaco) "MA" = ( -/obj/effect/attach_point/crew_weapon/dropship2{ +/obj/effect/attach_point/crew_weapon/dropship2/floor{ attach_id = 9 }, /turf/open/shuttle/dropship{ From df4913e9f7f137af24926580b34479887f4c956a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Jan 2024 13:34:00 +0000 Subject: [PATCH 4/8] Automatic changelog for PR #5495 [ci skip] --- html/changelogs/AutoChangeLog-pr-5495.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5495.yml diff --git a/html/changelogs/AutoChangeLog-pr-5495.yml b/html/changelogs/AutoChangeLog-pr-5495.yml new file mode 100644 index 000000000000..58990a93c18b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5495.yml @@ -0,0 +1,4 @@ +author: "Vicacrov" +delete-after: True +changes: + - bugfix: "Fixes engine/weapon attach points layering below the dropship walls." \ No newline at end of file From 551a5e18920de46fbfb682c587e274e49f3991a4 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Sat, 20 Jan 2024 14:11:27 +0100 Subject: [PATCH 5/8] add some board to the board vendor in engi on almayer (#5441) # About the pull request so adding those board is harmless i think since you can just dismantle computer to have them so no harm in giving some to MT's to maybe add some decoration etc or rebuilding a place the way it was... # 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: add: Add some boards to the board vendor in engi on almayer(Air Alarm Electronics, Security Camera Monitor, Station Alerts, Arcade, Atmospheric Monitor). /:cl: --------- Co-authored-by: Julien Co-authored-by: harryob --- code/game/machinery/vending/vendor_types/engineering.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm index 2275656d7a30..245e06009695 100644 --- a/code/game/machinery/vending/vendor_types/engineering.dm +++ b/code/game/machinery/vending/vendor_types/engineering.dm @@ -90,6 +90,11 @@ list("Research Data Terminal", 2, /obj/item/circuitboard/computer/research_terminal, VENDOR_ITEM_REGULAR), list("P.A.C.M.A.N Generator", 1, /obj/item/circuitboard/machine/pacman, VENDOR_ITEM_REGULAR), list("Auxiliar Power Storage Unit", 2, /obj/item/circuitboard/machine/ghettosmes, VENDOR_ITEM_REGULAR), + list("Air Alarm Electronics", 2, /obj/item/circuitboard/airalarm, VENDOR_ITEM_REGULAR), + list("Security Camera Monitor", 2, /obj/item/circuitboard/computer/cameras, VENDOR_ITEM_REGULAR), + list("Station Alerts", 2, /obj/item/circuitboard/computer/stationalert, VENDOR_ITEM_REGULAR), + list("Arcade", 2, /obj/item/circuitboard/computer/arcade, VENDOR_ITEM_REGULAR), + list("Atmospheric Monitor", 2, /obj/item/circuitboard/computer/air_management, VENDOR_ITEM_REGULAR), ) /obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag From cb1d6124d00f6731b9cad36c2f7205342dcb6f20 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Jan 2024 13:49:11 +0000 Subject: [PATCH 6/8] Automatic changelog for PR #5441 [ci skip] --- html/changelogs/AutoChangeLog-pr-5441.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5441.yml diff --git a/html/changelogs/AutoChangeLog-pr-5441.yml b/html/changelogs/AutoChangeLog-pr-5441.yml new file mode 100644 index 000000000000..bbcf6c5c5af5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5441.yml @@ -0,0 +1,4 @@ +author: "Huffie56" +delete-after: True +changes: + - rscadd: "Add some boards to the board vendor in engi on almayer(Air Alarm Electronics, Security Camera Monitor,\nStation Alerts, Arcade, Atmospheric Monitor)." \ No newline at end of file From a34b1c34df49f9dac5e20694210e2544c1497777 Mon Sep 17 00:00:00 2001 From: ClairionCM <115504494+ClairionCM@users.noreply.github.com> Date: Sun, 21 Jan 2024 00:15:50 +0100 Subject: [PATCH 7/8] Adds a semi-big whistle cooldown. (#5469) Adds a 10 second cooldown to the whistles to make them less spammy # About the pull request This PR gives the whistles a 10 second cooldown to have people spam them less. It also sends a message telling the player how long they need to wait before they can use it again. # Explain why it's good for the game Right now what often ends up happening is people deleting all of the whistles because they are VERY loud and VERY spammy. This should make that less of an issue. # Testing Photographs and Procedure
It works :D ![image](https://github.com/cmss13-devs/cmss13/assets/115504494/58487e7c-3584-4ff1-ad63-c8fc918fa5a0)
# Changelog :cl: qol: made whistles less spammy /:cl: --------- Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/objects/items/devices/whistle.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index d017a430b88a..331df3ffa006 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -8,7 +8,8 @@ actions_types = list(/datum/action/item_action) var/volume = 60 - var/spamcheck = 0 + var/spam_cooldown_time = 10 SECONDS + COOLDOWN_DECLARE(spam_cooldown) /obj/item/device/whistle/attack_self(mob/user) ..() @@ -28,14 +29,14 @@ ..() /obj/item/device/whistle/proc/whistle_playsound(mob/user) - if (spamcheck) + if(!COOLDOWN_FINISHED(src, spam_cooldown)) + to_chat(user, SPAN_DANGER("You are out of breath after using [src]! Wait [COOLDOWN_SECONDSLEFT(src, spam_cooldown)] second\s.")) return user.visible_message(SPAN_WARNING("[user] blows into [src]!")) playsound(get_turf(src), 'sound/items/whistle.ogg', volume, 1, vary = 0) - spamcheck = 1 - addtimer(VARSET_CALLBACK(src, spamcheck, FALSE), 3 SECONDS) + COOLDOWN_START(src, spam_cooldown, spam_cooldown_time) /obj/item/device/whistle/MouseDrop(obj/over_object) if(ishuman(usr)) From a3037ec6950567a2771829035f948caa1deff65a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Jan 2024 23:24:05 +0000 Subject: [PATCH 8/8] Automatic changelog for PR #5469 [ci skip] --- html/changelogs/AutoChangeLog-pr-5469.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5469.yml diff --git a/html/changelogs/AutoChangeLog-pr-5469.yml b/html/changelogs/AutoChangeLog-pr-5469.yml new file mode 100644 index 000000000000..3701dfdb8e5b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5469.yml @@ -0,0 +1,4 @@ +author: "ClairionCM" +delete-after: True +changes: + - qol: "made whistles less spammy" \ No newline at end of file