From 62e39c4ce6f05b2f051b6277be0a90c1f5fdd55c Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 12 Aug 2024 02:52:04 +0300 Subject: [PATCH 1/5] Update life.dm --- code/modules/mob/living/carbon/xenomorph/life.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index b5ad08e97a0..a3d09cfb940 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -220,19 +220,10 @@ if(stomach_contents.len) for(var/atom/movable/M in stomach_contents) if(ishuman(M)) - if(world.time > devour_timer - 50 && world.time < devour_timer - 30) - to_chat(src, SPAN_WARNING("You're about to regurgitate [M]...")) - playsound(loc, 'sound/voice/alien_drool1.ogg', 50, 1) var/mob/living/carbon/human/H = M - if(world.time > devour_timer || (H.stat == DEAD && !H.chestburst)) + if(H.stat == DEAD && !H.chestburst) regurgitate(H) - M.acid_damage++ - if(M.acid_damage > 300) - to_chat(src, SPAN_XENODANGER("\The [M] is dissolved in your gut with a gurgle.")) - stomach_contents.Remove(M) - qdel(M) - /mob/living/carbon/xenomorph/proc/handle_regular_hud_updates() if(!mind) return TRUE From 7f8b0066be9bd9fc5961ffbd47981d3f549769cc Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 12 Aug 2024 02:57:02 +0300 Subject: [PATCH 2/5] Revert "Automatic changelog compile [ci skip]" This reverts commit f930e3cc19b30cffaeeda97210cf98278e1cf47c. --- html/changelogs/AutoChangeLog-pr-360.yml | 4 ++++ html/changelogs/archive/2024-08.yml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/AutoChangeLog-pr-360.yml diff --git a/html/changelogs/AutoChangeLog-pr-360.yml b/html/changelogs/AutoChangeLog-pr-360.yml new file mode 100644 index 00000000000..41fc9dd0d62 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-360.yml @@ -0,0 +1,4 @@ +author: "private-tristan" +delete-after: True +changes: + - balance: "M56D has been buffed with more damage, accuracy, and firerate." \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 232a1874b30..f401f98deba 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -57,6 +57,3 @@ sunofang: - rscadd: Due to budget increases, Close Air Support now has ammo. - admin: Added a fire support menu for GM's to use. -2024-08-11: - private-tristan: - - balance: M56D has been buffed with more damage, accuracy, and firerate. From c2d9113eb5dfcdcd2dd5452c90f1edd629c26693 Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 12 Aug 2024 02:57:11 +0300 Subject: [PATCH 3/5] Revert "Automatic changelog for PR #360 [ci skip]" This reverts commit 4be22183f0760f1e1030b7206166f6254cb96486. --- html/changelogs/AutoChangeLog-pr-360.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-360.yml diff --git a/html/changelogs/AutoChangeLog-pr-360.yml b/html/changelogs/AutoChangeLog-pr-360.yml deleted file mode 100644 index 41fc9dd0d62..00000000000 --- a/html/changelogs/AutoChangeLog-pr-360.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "private-tristan" -delete-after: True -changes: - - balance: "M56D has been buffed with more damage, accuracy, and firerate." \ No newline at end of file From de03f16a3c9967806b2278fbc7edccc42fb4a3f2 Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 12 Aug 2024 02:57:15 +0300 Subject: [PATCH 4/5] Revert "Buff m56d (#360)" This reverts commit c4a859997ff456cc113662e1d372ea2baeef6e3f. --- code/datums/ammo/bullet/special_ammo.dm | 4 ++-- code/modules/cm_marines/smartgun_mount.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 3a592fc8b2c..0bf79ff4f03 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -104,9 +104,9 @@ icon_state = "bullet" // Keeping it bog standard with the turret but allows it to be changed accurate_range = 12 - damage = 40 + damage = 35 penetration= ARMOR_PENETRATION_TIER_10 //Bumped the penetration to serve a different role from sentries, MGs are a bit more offensive - accuracy = HIT_ACCURACY_TIER_5 + accuracy = HIT_ACCURACY_TIER_3 /datum/ammo/bullet/machinegun/set_bullet_traits() . = ..() diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index 1fb9868ed01..32983f455c6 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -471,7 +471,7 @@ GUN_FIREMODE_AUTOMATIC, ) /// A multiplier for how slow this gun should fire in automatic as opposed to burst. 1 is normal, 1.2 is 20% slower, 0.8 is 20% faster, etc. - var/autofire_slow_mult = 0.7 + var/autofire_slow_mult = 1 /// If the gun is currently burst firing VAR_PROTECTED/burst_firing = FALSE /// If the gun should display its ammo count From f7eb63c98cf742ad53c5a36e0212510e74cee7e2 Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 12 Aug 2024 02:57:18 +0300 Subject: [PATCH 5/5] Revert "Automatic changelog compile [ci skip]" This reverts commit 0bf29623d0937fb04ed2c23d6d44d17844af7b55. --- html/changelogs/AutoChangeLog-pr-321.yml | 5 ++++ html/changelogs/AutoChangeLog-pr-340.yml | 4 +++ html/changelogs/AutoChangeLog-pr-350.yml | 5 ++++ html/changelogs/AutoChangeLog-pr-354.yml | 4 +++ html/changelogs/AutoChangeLog-pr-359.yml | 20 +++++++++++++++ html/changelogs/archive/2024-08.yml | 31 ------------------------ 6 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 html/changelogs/AutoChangeLog-pr-321.yml create mode 100644 html/changelogs/AutoChangeLog-pr-340.yml create mode 100644 html/changelogs/AutoChangeLog-pr-350.yml create mode 100644 html/changelogs/AutoChangeLog-pr-354.yml create mode 100644 html/changelogs/AutoChangeLog-pr-359.yml diff --git a/html/changelogs/AutoChangeLog-pr-321.yml b/html/changelogs/AutoChangeLog-pr-321.yml new file mode 100644 index 00000000000..ee208ace0dd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-321.yml @@ -0,0 +1,5 @@ +author: "sunofang" +delete-after: True +changes: + - rscadd: "Due to budget increases, Close Air Support now has ammo." + - admin: "Added a fire support menu for GM's to use." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-340.yml b/html/changelogs/AutoChangeLog-pr-340.yml new file mode 100644 index 00000000000..40b44073ba8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-340.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - rscadd: "Added GM button to toggle AI xeno weeding" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-350.yml b/html/changelogs/AutoChangeLog-pr-350.yml new file mode 100644 index 00000000000..44b4846f168 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-350.yml @@ -0,0 +1,5 @@ +author: "Kitsunemitsu" +delete-after: True +changes: + - rscadd: "Added 3 more railgun types" + - balance: "Railgun now changes it's stats based off the altitude" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-354.yml b/html/changelogs/AutoChangeLog-pr-354.yml new file mode 100644 index 00000000000..7fa61f087da --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-354.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - bugfix: "less lag from xenos pathfinding unreachable targets" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-359.yml b/html/changelogs/AutoChangeLog-pr-359.yml new file mode 100644 index 00000000000..bcf7f475a10 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-359.yml @@ -0,0 +1,20 @@ +author: "Doubleumc" +delete-after: True +changes: + - qol: "Adds the ability to hide your action buttons" + - bugfix: "Fixed 'hidden' action buttons being shown to observing players." + - qol: "Made any observers transfer over when a Xenomorph evolves/de-evolves." + - rscadd: "Added 'observe' functionality to Xenomorphs, allowing observers to view the target's UI." + - rscadd: "Made observing a player also show their action buttons." + - spellcheck: "Made observers see the marine version of CAS warnings, rather than the xeno one." + - qol: "Made open TGUI windows transfer over when a xeno player evolves." + - bugfix: "Fixed observing a monkey/farwa/stok/etc. locking the camera onto it." + - bugfix: "Observer minimap should no longer occasionally show wrong / no map." + - code_imp: "environmental reverb applies more reliably and only to positional sounds" + - bugfix: "Notifications should no longer emit light." + - bugfix: "Sprite-click shots onto Xenos are no longer affected by limb-targeting penalty, because it was an accuracy debuff when there is no inherent benefit to targeting Xeno limbs." + - rscadd: "Locking down dropship's doors closes them before locking." + - bugfix: "Fix handling of sentry_computer deletion" + - refactor: "Refactored the overlay_lighting component to better handle objects deleting" + - bugfix: "Fix putting lights in bags somereason keeping the light on" + - refactor: "sentry laptop now uses camera manager component" \ No newline at end of file diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index f401f98deba..db9a377dbb4 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -26,34 +26,3 @@ - rscadd: 'added more cigarette options in the loadout, along with a golden zippo :cl:' -2024-08-10: - Doubleumc: - - qol: Adds the ability to hide your action buttons - - bugfix: Fixed 'hidden' action buttons being shown to observing players. - - qol: Made any observers transfer over when a Xenomorph evolves/de-evolves. - - rscadd: Added 'observe' functionality to Xenomorphs, allowing observers to view - the target's UI. - - rscadd: Made observing a player also show their action buttons. - - spellcheck: Made observers see the marine version of CAS warnings, rather than - the xeno one. - - qol: Made open TGUI windows transfer over when a xeno player evolves. - - bugfix: Fixed observing a monkey/farwa/stok/etc. locking the camera onto it. - - bugfix: Observer minimap should no longer occasionally show wrong / no map. - - code_imp: environmental reverb applies more reliably and only to positional sounds - - bugfix: Notifications should no longer emit light. - - bugfix: Sprite-click shots onto Xenos are no longer affected by limb-targeting - penalty, because it was an accuracy debuff when there is no inherent benefit - to targeting Xeno limbs. - - rscadd: Locking down dropship's doors closes them before locking. - - bugfix: Fix handling of sentry_computer deletion - - refactor: Refactored the overlay_lighting component to better handle objects deleting - - bugfix: Fix putting lights in bags somereason keeping the light on - - refactor: sentry laptop now uses camera manager component - - bugfix: less lag from xenos pathfinding unreachable targets - - rscadd: Added GM button to toggle AI xeno weeding - Kitsunemitsu: - - rscadd: Added 3 more railgun types - - balance: Railgun now changes it's stats based off the altitude - sunofang: - - rscadd: Due to budget increases, Close Air Support now has ammo. - - admin: Added a fire support menu for GM's to use.