From 585a885b1f5c667f6e2a4da55571c7cde833a338 Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sun, 21 Apr 2024 16:53:25 +0200
Subject: [PATCH] Easy fix (#25216)
---
.../mob/living/carbon/human/species/unathi.dm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index 9faf4ae4c51..175252cd3ec 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -57,15 +57,15 @@
/datum/species/unathi/on_species_gain(mob/living/carbon/human/H)
..()
- var/datum/action/innate/ignite/fire = new()
+ var/datum/action/innate/unathi_ignite/fire = new()
fire.Grant(H)
/datum/species/unathi/on_species_loss(mob/living/carbon/human/H)
..()
- for(var/datum/action/innate/ignite/fire in H.actions)
+ for(var/datum/action/innate/unathi_ignite/fire in H.actions)
fire.Remove(H)
-/datum/action/innate/ignite
+/datum/action/innate/unathi_ignite
name = "Ignite"
desc = "A fire forms in your mouth, fierce enough to... light a cigarette. Requires you to drink welding fuel beforehand."
icon_icon = 'icons/obj/cigarettes.dmi'
@@ -75,7 +75,7 @@
var/welding_fuel_used = 3 //one sip, with less strict timing
check_flags = AB_CHECK_HANDS_BLOCKED
-/datum/action/innate/ignite/Activate()
+/datum/action/innate/unathi_ignite/Activate()
var/mob/living/carbon/human/user = owner
if(world.time <= cooldown)
to_chat(user, "Your throat hurts too much to do it right now. Wait [round((cooldown - world.time) / 10)] seconds and try again.")
@@ -95,7 +95,6 @@
else
to_chat(user, "You need to drink welding fuel first.")
-
/datum/species/unathi/handle_death(gibbed, mob/living/carbon/human/H)
H.stop_tail_wagging()
@@ -127,14 +126,14 @@
/datum/species/unathi/ashwalker/on_species_gain(mob/living/carbon/human/H)
..()
- for(var/datum/action/innate/ignite/fire in H.actions)
+ for(var/datum/action/innate/unathi_ignite/fire in H.actions)
fire.Remove(H)
- var/datum/action/innate/ignite/ash_walker/fire = new()
+ var/datum/action/innate/unathi_ignite/ash_walker/fire = new()
fire.Grant(H)
/datum/species/unathi/ashwalker/on_species_loss(mob/living/carbon/human/H)
..()
- for(var/datum/action/innate/ignite/ash_walker/fire in H.actions)
+ for(var/datum/action/innate/unathi_ignite/ash_walker/fire in H.actions)
fire.Remove(H)
/datum/species/unathi/ashwalker/movement_delay(mob/living/carbon/human/H)
@@ -143,7 +142,7 @@
if(!is_mining_level(our_turf.z))
. -= speed_mod
-/datum/action/innate/ignite/ash_walker
+/datum/action/innate/unathi_ignite/ash_walker
desc = "You form a fire in your mouth, fierce enough to... light a cigarette."
cooldown_duration = 3 MINUTES
welding_fuel_used = 0 // Ash walkers dont need welding fuel to use ignite