Merge branch 'Citadel-Station-13:master' into Frozen-airlocks

Citadel-Station-13 · Sep 9, 2023 · 16244dd · 16244dd
2 parents 7cec599 + 3963de5
commit 16244dd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git 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/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)
 

diff --git 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

diff --git 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
@@ -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
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
@@ -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 <b>arc over obstructions</b> 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
diff --git 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 (
     <Flex.Item grow="1" overflow="auto">
-      <Section onClick={e => refocusLayout()}>
+      <Section>
         {has_contents
           ? contents : (
             <Box color="label">