From f25cc08bc61c65b102aee1c2a53094dee3b3edfe Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 8 Sep 2023 21:58:00 -0700 Subject: [PATCH 1/5] fixes a list referencing oopsie (#5957) --- code/modules/atmospherics/machinery/air_alarm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/machinery/air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm.dm index 29a26ba85a4..3d7a32a2550 100644 --- a/code/modules/atmospherics/machinery/air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm.dm @@ -127,7 +127,7 @@ GLOBAL_LIST_EMPTY(air_alarms) continue if(!isnull(tlv_ids[id])) continue - tlv_ids[id] = default + tlv_ids[id] = default.Copy() for(var/group in global.gas_data.gas_group_names_filterable) if(!isnull(tlv_groups[group])) continue From 83a9051ce323fc1611bd0758a97d225590e2fa8d Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 9 Sep 2023 05:58:30 +0100 Subject: [PATCH 2/5] biogenerator fixes (#5955) ## About The Pull Request fixes bluescreen fixes stack size incrementing by 1 when you print 5 ## Why It's Good For The Game fixes bugs ## Changelog :cl: fix: fixes bluescreen fix: fixes stack size incrementing by 1 when you print 5 /:cl: --- code/game/machinery/biogenerator.dm | 3 +-- tgui/packages/tgui/interfaces/Biogenerator.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 0905e6c6682..672543bcf0f 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -231,8 +231,7 @@ points -= cost if(ispath(bi.equipment_path, /obj/item/stack)) - var/obj/item/stack/S = new bi.equipment_path(loc) - S.amount = bi.equipment_amt + new bi.equipment_path(loc, bi.equipment_amt) playsound(src, 'sound/machines/vending/vending_drop.ogg', 100, 1) return TRUE diff --git a/tgui/packages/tgui/interfaces/Biogenerator.js b/tgui/packages/tgui/interfaces/Biogenerator.js index 743ce66f3a9..b0b4a724428 100644 --- a/tgui/packages/tgui/interfaces/Biogenerator.js +++ b/tgui/packages/tgui/interfaces/Biogenerator.js @@ -3,7 +3,6 @@ import { Fragment } from 'inferno'; import { useBackend, useLocalState } from "../backend"; import { Box, Button, Collapsible, Dropdown, Flex, Input, Section } from '../components'; import { Window } from "../layouts"; -import { refocusLayout } from '../layouts'; const sortTypes = { 'Alphabetical': (a, b) => a - b, @@ -98,7 +97,7 @@ const BiogeneratorItems = (props, context) => { }); return ( -
refocusLayout()}> +
{has_contents ? contents : ( From 545d184d290fe7756f78ffb3f5a4d5fc953ba62c Mon Sep 17 00:00:00 2001 From: LordPapalus <54518057+LordPapalus@users.noreply.github.com> Date: Sat, 9 Sep 2023 06:59:13 +0200 Subject: [PATCH 3/5] Fixes and creates variants of the Opaque Gas Mask (#5954) ## About The Pull Request Finally splits the opaque gas mask into one without any gas being filtered out, and one which is designed for nitrogen breathers. ## Why It's Good For The Game People requested the opaque mask be given a no-filter version for a long while but nobody even tried to do it. Also brings the filter list up to date. ## Changelog :cl: add: New variant of the Opaque Mask fix: Fixes gas paths for the Filtered version /:cl: --- code/modules/clothing/masks/gasmask.dm | 9 +++++++-- code/modules/loadout/loadout_mask.dm | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 31240d01e16..f53a0780d89 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -140,11 +140,16 @@ /obj/item/clothing/mask/gas/opaque name = "Opaque Mask" - desc = "A face-covering mask with an opaque faceplate that can be connected to an air supply, often used by various alien races to filter out oxygen." + desc = "A face-covering mask with an opaque faceplate that can be connected to an air supply. Despite being stripped of all advanced technolgy, it still seems airtight." icon_state = "opaque_mask" inv_hide_flags = null - filtered_gases = list(/datum/gas/phoron, /datum/gas/nitrous_oxide, /datum/gas/oxygen) +/obj/item/clothing/mask/gas/opaque_nitrogen + name = "Opaque Mask - Oxygen Filter" + desc = "A face-covering mask with an opaque faceplate that can be connected to an air supply, often used by various alien races to filter out oxygen." + icon_state = "opaque_mask" + inv_hide_flags = null + filtered_gases = list(GAS_ID_PHORON, GAS_ID_NITROUS_OXIDE, GAS_ID_OXYGEN) /obj/item/clothing/mask/gas/syndicate name = "tactical mask" diff --git a/code/modules/loadout/loadout_mask.dm b/code/modules/loadout/loadout_mask.dm index 8c2c66a9e7d..7e8ed8ca013 100644 --- a/code/modules/loadout/loadout_mask.dm +++ b/code/modules/loadout/loadout_mask.dm @@ -57,3 +57,7 @@ /datum/loadout_entry/mask/opaque name = "Opaque Mask" path = /obj/item/clothing/mask/gas/opaque + +/datum/loadout_entry/mask/opaque_nitrogen + name = "Opaque Mask - Oxygen Filter" + path = /obj/item/clothing/mask/gas/opaque_nitrogen From 95c3d9e1e9f554fe709a0c318ddd7ff09f6d4c8f Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 8 Sep 2023 21:59:42 -0700 Subject: [PATCH 4/5] fixes hf machete (#5953) --- code/game/objects/items/weapons/melee/energy.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 04e078271fa..30eb2ca05c5 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -642,9 +642,6 @@ icon_state = "[base_state][active]" /obj/item/melee/energy/hfmachete/attack_self(mob/user) - . = ..() - if(.) - return toggleActive(user) add_fingerprint(user) From 3963de509e75772b53f591ce750ac68d19e575c4 Mon Sep 17 00:00:00 2001 From: CharlesWedge <52897649+CharlesWedge@users.noreply.github.com> Date: Fri, 8 Sep 2023 23:59:58 -0500 Subject: [PATCH 5/5] Mortar Hivebot Nerf Hotfix (#5947) ## These were meant to be nerfed in the original PR I forgot to change their porjectile typepath so they use the projectile that doesn't instantly kill you. ## Changelog :cl: balance: Instead of using the projectile that instantly kills you even in heavy armor, the mortar hivebots now use the much more reasonable and balanced 'mortar' projectile attack /:cl: --- .../simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index ee9640c505c..eed75844a64 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -109,6 +109,7 @@ desc = "A hivebot that equipped with a long range magenetic weapon." icon_state = "sniper" icon_living = "sniper" + base_attack_cooldown = 60 projectiletype = /obj/projectile/bullet/magnetic projectilesound = 'sound/weapons/railgun.ogg' player_msg = "Your attacks are short-ranged, but can arc over obstructions such as allies \ @@ -142,7 +143,7 @@ maxHealth = 4 LASERS_TO_KILL // 120 health. health = 4 LASERS_TO_KILL - reload_max = 5 + base_attack_cooldown = 5 ai_holder_type = /datum/ai_holder/simple_mob/ranged/sniper catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/siege) @@ -199,4 +200,4 @@ base_attack_cooldown = 60 - projectiletype = /obj/projectile/arc/fragmentation + projectiletype = /obj/projectile/arc/fragmentation/mortar