From 0f4fa5b6c020b719474433b21cf30034adb967b2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 6 Sep 2023 01:06:27 +0000 Subject: [PATCH 1/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4246.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4298.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4329.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4334.yml | 4 ---- html/changelogs/archive/2023-09.yml | 10 ++++++++++ 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4246.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4298.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4329.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4334.yml diff --git a/html/changelogs/AutoChangeLog-pr-4246.yml b/html/changelogs/AutoChangeLog-pr-4246.yml deleted file mode 100644 index 5101fc295eec..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4246.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fixed xeno grab intent" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4298.yml b/html/changelogs/AutoChangeLog-pr-4298.yml deleted file mode 100644 index 9f03337cafa0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4298.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - bugfix: "fixed eggsac carrier strain not updating hugger sprites." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4329.yml b/html/changelogs/AutoChangeLog-pr-4329.yml deleted file mode 100644 index 229c88aa925e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4329.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - rscadd: "Added a ghost notification for Acid Runner For the Hive! ability." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4334.yml b/html/changelogs/AutoChangeLog-pr-4334.yml deleted file mode 100644 index 6d99db8da34d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4334.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "RenaRenaRe" -delete-after: True -changes: - - bugfix: "Hugger and Lesser Drone ghosts now actually bypass time of death checks for the larva queue." \ No newline at end of file diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index 27c0065c283b..84db1622da50 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -62,3 +62,13 @@ Zonespace27: - bugfix: Working Joes no longer get cryo self defense kits - bugfix: Cryo self defense kits now have the correct amount of slots +2023-09-06: + Birdtalon: + - bugfix: fixed eggsac carrier strain not updating hugger sprites. + Drathek: + - bugfix: Fixed xeno grab intent + Morrow: + - rscadd: Added a ghost notification for Acid Runner For the Hive! ability. + RenaRenaRe: + - bugfix: Hugger and Lesser Drone ghosts now actually bypass time of death checks + for the larva queue. From 5290262025af4f22fb66be04a7dfd766fc5252d0 Mon Sep 17 00:00:00 2001 From: harryob Date: Wed, 6 Sep 2023 06:48:39 +0100 Subject: [PATCH 2/8] moves full auto guns to be full auto by default (#4335) i think having the qol of full auto behind the unintuitive weapon change verb. the Real fraggers that know that burst/semi-auto (take your pick) is better will just change to it and feel more elitist :cl: add: guns that have full auto now start on full auto by default /:cl: --- code/modules/projectiles/gun_helpers.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index d58385d3edc0..6c94973997f5 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -693,15 +693,15 @@ DEFINES in setup.dm, referenced here. var/old_firemode = gun_firemode gun_firemode_list.len = 0 + if(start_automatic) + gun_firemode_list |= GUN_FIREMODE_AUTOMATIC + if(start_semiauto) gun_firemode_list |= GUN_FIREMODE_SEMIAUTO if(burst_amount > BURST_AMOUNT_TIER_1) gun_firemode_list |= GUN_FIREMODE_BURSTFIRE - if(start_automatic) - gun_firemode_list |= GUN_FIREMODE_AUTOMATIC - if(!length(gun_firemode_list)) CRASH("[src] called setup_firemodes() with an empty gun_firemode_list") From ec43b581bc1b26e7117db8fc540b6e8f031c7f14 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 6 Sep 2023 06:56:34 +0100 Subject: [PATCH 3/8] Automatic changelog for PR #4335 [ci skip] --- html/changelogs/AutoChangeLog-pr-4335.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4335.yml diff --git a/html/changelogs/AutoChangeLog-pr-4335.yml b/html/changelogs/AutoChangeLog-pr-4335.yml new file mode 100644 index 000000000000..9314211c36dd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4335.yml @@ -0,0 +1,4 @@ +author: "harryob" +delete-after: True +changes: + - rscadd: "guns that have full auto now start on full auto by default" \ No newline at end of file From c79e35c907f23618fc51cab7e688fd0b638f2066 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Wed, 6 Sep 2023 11:22:36 -0400 Subject: [PATCH 4/8] Null reference fix for full auto (#4340) # About the pull request If you drop the gun while holding down full auto it will attempt to fire the next shot. The (!user) check on line 1917 just tries to assign gun_user to user but since there is no gun_user either it passes null. I debated on where to put this check for if user existed and am happy to move it around (and also remove the !target as it doesn't *seem* to have any issues so far). ``` runtime error: Cannot execute null.is mob incapacitated(). proc name: able to fire (/obj/item/weapon/gun/proc/able_to_fire) source file: code/modules/projectiles/gun.dm,1495 usr: null src: the NSG 23 assault rifle (/obj/item/weapon/gun/rifle/nsg23/no_lock) src.loc: the floor (36,18,2) (/turf/open/floor/greengrid) call stack: the NSG 23 assault rifle (/obj/item/weapon/gun/rifle/nsg23/no_lock): able to fire(null) the NSG 23 assault rifle (/obj/item/weapon/gun/rifle/nsg23/no_lock): Fire(the grass (36,25,2) (/turf/open/gm/grass/grass1), null, null, 0, null) the NSG 23 assault rifle (/obj/item/weapon/gun/rifle/nsg23/no_lock): fire wrapper(the grass (36,25,2) (/turf/open/gm/grass/grass1), null, null, 0, null) /datum/callback (/datum/callback): Invoke() /datum/component/automatedfire... (/datum/component/automatedfire/autofire): process shot() ImmediateInvokeAsync(/datum/component/automatedfire... (/datum/component/automatedfire/autofire), "process_shot") Automated fire (/datum/controller/subsystem/automatedfire): fire(0) Automated fire (/datum/controller/subsystem/automatedfire): ignite(0) Master (/datum/controller/master): RunQueue() Master (/datum/controller/master): Loop(2) Master (/datum/controller/master): StartProcessing(0) ``` # Changelog :cl: Morrow fix: Fixed a null reference when firing full auto and dropping your weapon /:cl: --- code/modules/projectiles/gun.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0b54d973549a..2eddf975c1b9 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1916,6 +1916,8 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed target = src.target if(!user) user = gun_user + if(!target || !user) + return NONE return Fire(target, user, params, reflex, dual_wield) /// Setter proc for fa_firing From 407f561aa190601abca4d4027709b41f9c6617ef Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 6 Sep 2023 16:30:48 +0100 Subject: [PATCH 5/8] Automatic changelog for PR #4340 [ci skip] --- html/changelogs/AutoChangeLog-pr-4340.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4340.yml diff --git a/html/changelogs/AutoChangeLog-pr-4340.yml b/html/changelogs/AutoChangeLog-pr-4340.yml new file mode 100644 index 000000000000..7e2b88d0854a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4340.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - bugfix: "Fixed a null reference when firing full auto and dropping your weapon" \ No newline at end of file From 83b949fe0878b2cda7d03d7466a4607130e77741 Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Thu, 7 Sep 2023 00:54:34 +0800 Subject: [PATCH 6/8] Fix UPP Hostile ERT Not Spawning With Gun (#4313) # About the pull request Fixes a situation where a UPP Soldier in the ERT would not spawn with a gun, had a 33% chance to occur. # Explain why it's good for the game Bug # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: ERT UPP Soldiers will now correctly spawn with firearms. /:cl: --------- Co-authored-by: Steelpoint --- code/modules/gear_presets/_select_equipment.dm | 16 ++++++++++++++++ code/modules/gear_presets/upp.dm | 16 +--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 9d02cce8c5e9..4c3a4476d733 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -951,6 +951,22 @@ var/list/rebel_rifles = list( list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR) ) +/datum/equipment_preset/proc/load_upp_shotgun(mob/living/carbon/human/new_human) + var/random_shotgun = rand(1,3) + switch(random_shotgun) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/slug, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_R_STORE) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/flechette, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_R_STORE) + /datum/equipment_preset/proc/add_upp_weapon(mob/living/carbon/human/new_human) var/random_gun = rand(1,5) switch(random_gun) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 58ee8b0156fa..39a6c98aea0f 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -127,22 +127,8 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //4.25 //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/np92, WEAR_WAIST) + load_upp_shotgun(new_human) -/datum/equipment_preset/upp/soldier/proc/pick_ammotype(mob/living/carbon/human/new_human) - var/percentage = rand(1, 100) - switch(percentage) - if(1 to 33) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) - if(34 to 66) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/slug, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_R_STORE) - else - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/flechette, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_R_STORE) /datum/equipment_preset/upp/soldier/proc/load_upp_double(mob/living/carbon/human/new_human, obj/item/clothing/under/marine/veteran/UPP/UPP) //back From 0537cfbcb5c17255074659970ba48c348fb17852 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:03:34 +0100 Subject: [PATCH 7/8] Automatic changelog for PR #4313 [ci skip] --- html/changelogs/AutoChangeLog-pr-4313.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4313.yml diff --git a/html/changelogs/AutoChangeLog-pr-4313.yml b/html/changelogs/AutoChangeLog-pr-4313.yml new file mode 100644 index 000000000000..d94028f4eeda --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4313.yml @@ -0,0 +1,4 @@ +author: "Steelpoint" +delete-after: True +changes: + - bugfix: "ERT UPP Soldiers will now correctly spawn with firearms." \ No newline at end of file From 5d5f73d880ffbe9229874dff2b78232a42eb105f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 7 Sep 2023 01:06:39 +0000 Subject: [PATCH 8/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4313.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4335.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4340.yml | 4 ---- html/changelogs/archive/2023-09.yml | 7 +++++++ 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4313.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4335.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4340.yml diff --git a/html/changelogs/AutoChangeLog-pr-4313.yml b/html/changelogs/AutoChangeLog-pr-4313.yml deleted file mode 100644 index d94028f4eeda..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4313.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Steelpoint" -delete-after: True -changes: - - bugfix: "ERT UPP Soldiers will now correctly spawn with firearms." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4335.yml b/html/changelogs/AutoChangeLog-pr-4335.yml deleted file mode 100644 index 9314211c36dd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4335.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - rscadd: "guns that have full auto now start on full auto by default" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4340.yml b/html/changelogs/AutoChangeLog-pr-4340.yml deleted file mode 100644 index 7e2b88d0854a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4340.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - bugfix: "Fixed a null reference when firing full auto and dropping your weapon" \ No newline at end of file diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index 84db1622da50..e164bd50d41a 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -72,3 +72,10 @@ RenaRenaRe: - bugfix: Hugger and Lesser Drone ghosts now actually bypass time of death checks for the larva queue. +2023-09-07: + Morrow: + - bugfix: Fixed a null reference when firing full auto and dropping your weapon + Steelpoint: + - bugfix: ERT UPP Soldiers will now correctly spawn with firearms. + harryob: + - rscadd: guns that have full auto now start on full auto by default