Merge remote-tracking branch 'upstream/master'

code/datums/components/heart_eater.dm

@@ -13,9 +13,9 @@
 		/datum/mutation/human/adaptation/thermal,
 		/datum/mutation/human/chameleon,
 		/datum/mutation/human/cryokinesis,
-		/datum/mutation/human/cryokinesis/pyrokinesis,
+		/datum/mutation/human/pyrokinesis,
 		/datum/mutation/human/dwarfism,
-		/datum/mutation/human/geladikinesis/ash,
+		/datum/mutation/human/cindikinesis,
 		/datum/mutation/human/insulated,
 		/datum/mutation/human/telekinesis,
 		/datum/mutation/human/telepathy,

code/datums/mutations/_combined.dm

@@ -27,11 +27,11 @@
 
 /datum/generecipe/cindikinesis
 	required = "/datum/mutation/human/geladikinesis; /datum/mutation/human/fire_breath"
-	result = /datum/mutation/human/geladikinesis/ash
+	result = /datum/mutation/human/cindikinesis
 
 /datum/generecipe/pyrokinesis
 	required = "/datum/mutation/human/cryokinesis; /datum/mutation/human/fire_breath"
-	result = /datum/mutation/human/cryokinesis/pyrokinesis
+	result = /datum/mutation/human/pyrokinesis
 
 /datum/generecipe/thermal_adaptation
 	required = "/datum/mutation/human/adaptation/cold; /datum/mutation/human/adaptation/heat"

code/datums/mutations/cold.dm

@@ -37,6 +37,7 @@
 	button_icon_state = "icebeam"
 	base_icon_state = "icebeam"
 	active_overlay_icon_state = "bg_spell_border_active_blue"
+	cast_range = 9
 	cooldown_time = 16 SECONDS
 	spell_requirements = NONE
 	antimagic_flags = NONE

code/datums/mutations/hot.dm

@@ -1,30 +1,48 @@
-/datum/mutation/human/geladikinesis/ash
+/datum/mutation/human/cindikinesis
 	name = "Cindikinesis"
 	desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting."
+	quality = POSITIVE
 	text_gain_indication = span_notice("Your hand feels warm.")
+	instability = POSITIVE_INSTABILITY_MINOR
+	difficulty = 10
+	synchronizer_coeff = 1
 	locked = TRUE
-	power_path = /datum/action/cooldown/spell/conjure_item/snow/ash
+	power_path = /datum/action/cooldown/spell/conjure_item/ash
 
-/datum/action/cooldown/spell/conjure_item/snow/ash
+/datum/action/cooldown/spell/conjure_item/ash
 	name = "Create Ash"
 	desc = "Concentrates pyrokinetic forces to create ash, useful for basically nothing."
 	button_icon_state = "ash"
 
+	cooldown_time = 5 SECONDS
+	spell_requirements = NONE
+
 	item_type = /obj/effect/decal/cleanable/ash
+	delete_old = FALSE
+	delete_on_failure = FALSE
 
-/datum/mutation/human/cryokinesis/pyrokinesis
+/datum/mutation/human/pyrokinesis
 	name = "Pyrokinesis"
 	desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will."
+	quality = POSITIVE
 	text_gain_indication = span_notice("Your hand feels hot!")
+	instability = POSITIVE_INSTABILITY_MODERATE
+	difficulty = 12
+	synchronizer_coeff = 1
+	energy_coeff = 1
 	locked = TRUE
-	power_path = /datum/action/cooldown/spell/pointed/projectile/cryo/pyro
+	power_path = /datum/action/cooldown/spell/pointed/projectile/pyro
 
-/datum/action/cooldown/spell/pointed/projectile/cryo/pyro
+/datum/action/cooldown/spell/pointed/projectile/pyro
 	name = "Pyrobeam"
 	desc = "This power fires a heated bolt at a target."
 	button_icon_state = "firebeam"
 	base_icon_state = "firebeam"
+	active_overlay_icon_state = "bg_spell_border_active_blue"
+	cast_range = 9
 	cooldown_time = 30 SECONDS
+	spell_requirements = NONE
+	antimagic_flags = NONE
 
 	active_msg = "You focus your pyrokinesis!"
 	deactive_msg = "You cool down."

html/changelogs/archive/2024-10.yml

@@ -345,3 +345,39 @@
   - qol: Jetpack movement near walls should be much smoother
   grungussuss:
   - bugfix: a lot of items that shouldn't slosh when picked up will no longer slosh
+2024-10-13:
+  Ben10Omintrix:
+  - bugfix: fixes ashdrake arena attack not clearing out lavaland walls
+  Ghommie:
+  - bugfix: Fish like slimefish, unmarine bonemass and deepfryer fish can now be used
+      for DNA infusions.
+  - rscadd: You can buy a fishing rod pre-equipped with a rescue hook from the mining
+      order console.
+  - balance: Paramedics can get a rescue fishing hook as a heirloom.
+  Jewelry-x:
+  - bugfix: the ghost "t-ray view" no longer requires a double press to activate a
+      second time.
+  - qol: renamed "t-ray view" to "t-ray scan" for clarity.
+  SmArtKar:
+  - bugfix: Untie shoes should have its cooldown increased correctly when casting
+      it from a long distance
+  - bugfix: Plasmaman space suit internal extinguisher works and can be refilled now
+  - refactor: Refactored plasmamen self-ignition to be limb-side instead of being
+      handled by their species
+  Striders13:
+  - balance: replaced gas mask fov with pepperspray applying tint to gas masks, making
+      the wearer blind until washed off.
+  YakumoChen:
+  - spellcheck: Proofreads some faxes sent during radioactive nebulae
+  grungussuss:
+  - balance: all chainsaws can now behead people
+  - rscadd: a lot of basic mobs and pets got new emotes
+  - refactor: emotes triggered by petting pets work differently now, please report
+      any oddities with these behaviors.
+  - sound: new emotes for basic mobs got sounds
+  - bugfix: snore emote works properly now
+  necromanceranne:
+  - bugfix: Pyrokinesis/Cryokinesis cast range matches its projectile range.
+  - code_imp: Pyrokinesis and Cindikinesis are now their own types and not subtypes
+      of Cryokinesis and Geladikinesis. This allows you to not have to mutate yourself
+      in a specific order to not lock yourself out of the other mutation.