Merge branch 'master' into atmos_immune

code/modules/cargo/blackmarket/blackmarket_items/ammo.dm

@@ -57,17 +57,6 @@
 	stock = 6
 	availability_prob = 0
 
-/datum/blackmarket_item/ammo/c299
-	name = "Eoehoma .299 Caseless Ammo Box"
-	desc = "This ammunition for the E-40 Hybrid Rifle is probably worth more than the people you're shooting it at."
-	item = /obj/item/storage/box/ammo/c299
-
-	price_min = 300
-	price_max = 700
-	stock_min = 4
-	stock_max = 8
-	availability_prob = 0
-
 /datum/blackmarket_item/ammo/saber_mag
 	name = "Saber 9mm SMG Magazines"
 	desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."

code/modules/cargo/blackmarket/blackmarket_items/weapons.dm

@@ -129,7 +129,7 @@
 	name = "E-40 Hybrid Assault Rifle"
 	desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless."
 	item = /obj/item/gun/ballistic/automatic/assault/e40
-	pair_item = list(/datum/blackmarket_item/ammo/e40_mag, /datum/blackmarket_item/ammo/c299)
+	pair_item = list(/datum/blackmarket_item/ammo/e40_mag)
 
 	price_min = 7000
 	price_max = 10000

code/modules/cargo/packs/ammo.dm

@@ -424,6 +424,12 @@
 	contains = list(/obj/item/storage/box/ammo/a44roum_hp)
 	cost = 500
 
+/datum/supply_pack/ammo/c299
+	name = ".299 Eoehoma Caseless Ammo Box Crate"
+	desc = "Contains a 120-round box of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle."
+	contains = list(/obj/item/storage/box/ammo/c299)
+	cost = 250
+
 /datum/supply_pack/ammo/c22lr
 	name = ".22 LR Ammo Box Crate"
 	desc = "Contains a 60-round ammo box for refilling .22 LR weapons."

code/modules/mapping/mapping_helpers.dm

@@ -152,6 +152,25 @@
 	else
 		airlock.locked = TRUE
 
+/obj/effect/mapping_helpers/airlock/welded
+	name = "airlock welder"
+
+/obj/effect/mapping_helpers/airlock/welded/payload(obj/machinery/door/airlock/airlock)
+	if(airlock.welded)
+		log_mapping("[src] at [AREACOORD(src)] tried to weld [airlock] but it's already locked!")
+	else
+		airlock.welded = TRUE
+
+/obj/effect/mapping_helpers/airlock/sealed
+	name = "airlock sealer"
+
+/obj/effect/mapping_helpers/airlock/sealed/payload(obj/machinery/door/airlock/airlock)
+	if(airlock.seal)
+		log_mapping("[src] at [AREACOORD(src)] tried to seal [airlock] but it's already already got a seal? What the hell!")
+	else
+		airlock.seal = new /obj/item/door_seal(src)
+
+
 
 /obj/effect/mapping_helpers/airlock/unres
 	name = "airlock unresctricted side helper"

code/modules/mob/mob.dm

@@ -537,9 +537,9 @@
 	visible_message("<span class='notice'> [name] begins feeling around for \the [examined_thing.name]...</span>")
 
 	/// how long it takes for the blind person to find the thing they're examining
-	var/examine_delay_length = rand(1 SECONDS, 2 SECONDS)
+	var/examine_delay_length = rand(0.5 SECONDS, 1 SECONDS)
 	if(client?.recent_examines && client?.recent_examines[examined_thing]) //easier to find things we just touched
-		examine_delay_length = 0.5 SECONDS
+		examine_delay_length = 0.25 SECONDS
 	else if(isobj(examined_thing))
 		examine_delay_length *= 1.5
 	else if(ismob(examined_thing) && examined_thing != src)

code/modules/projectiles/ammunition/_ammo_casing.dm

@@ -107,7 +107,7 @@
 
 /obj/item/ammo_casing/examine(mob/user)
 	. = ..()
-	span_notice("You could write a message on \the [src] by writing on it with a pen.")
+	. += span_notice("You could write a message on \the [src] by writing on it with a pen.")
 
 /obj/item/ammo_casing/proc/try_stacking(obj/item/ammo_casing/other_casing, mob/living/user)
 	if(user)

code/modules/projectiles/guns/ballistic/assault.dm

@@ -154,7 +154,7 @@
 	var/obj/item/gun/energy/laser/e40_laser_secondary/secondary
 	fire_select_icon_state_prefix = "e40_"
 
-	fire_delay = 0.18 SECONDS
+	fire_delay = 0.1 SECONDS
 	recoil_unwielded = 3
 
 	gun_firenames = list(FIREMODE_FULLAUTO = "full auto ballistic", FIREMODE_OTHER = "full auto laser")

code/modules/research/designs/machine_designs.dm

@@ -85,7 +85,8 @@
 	desc = "The circuit board for a space heater."
 	id = "space_heater"
 	build_path = /obj/item/circuitboard/machine/space_heater
-	category = list ("Engineering Machinery")
+	build_type = AUTOLATHE | IMPRINTER
+	category = list ("Engineering Machinery", "initial", "Equipment")
 	departmental_flags = ALL
 
 /datum/design/board/teleport_station

html/changelogs/AutoChangeLog-pr-3576.yml

@@ -0,0 +1,4 @@
+author: FalloutFalcon
+changes:
+  - {balance: blind people can examine twice as fast}
+delete-after: true

html/changelogs/archive/2024-10.yml

@@ -253,3 +253,29 @@
   - rscadd: Atlas-class Light Armored Crusier
   rye-rice:
   - rscadd: Resprites the commander and Commissioner
+2024-10-19:
+  Apogee-dev:
+  - balance: Reduced Cobra-20 magazine size to 24 rounds
+  - bugfix: removed a typo from Scarborough cargo catalog entries
+  Erikafox:
+  - rscdel: Xenobiology (minus slimes)
+  - code_imp: pre-weld and pre-sealed airlock helpers for maps.
+  FalloutFalcon:
+  - rscadd: Autolathes can now print space heater boards.
+  - bugfix: examine on ammo casings now properly hint that you can write on them
+  Gristlebee:
+  - rscadd: Bullets can have a message written on them.
+  NithaIsTired:
+  - rscadd: Adds a ton of audible emotes and visible emotes like snapping your fingers
+      or twitching
+  - rscadd: You can boop people on the nose by clicking on their mouth with help intent
+  - rscadd: Sound variation with a few emotes like snapping and clapping
+  - rscadd: Laying down now plays a sound if you aren't on walk intent
+  Orchidthederg:
+  - bugfix: fallback sprite for dust storms was set to the carp sprite for some reason.
+  - imageadd: fancy new carp, meteor, and electrical storm
+  - imagedel: old carp, meteor, and electrical storm sprites
+  Spookywastaken:
+  - imageadd: Handrails have been resprited!
+  generalthrax:
+  - balance: E40 hybrid rifle ballistic mode now shoots faster