From a88e547b2c89dbcbcd02b9e57c8c378867e18c2a Mon Sep 17 00:00:00 2001 From: Jaeger <80431951+Kilmented@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:22:36 -0500 Subject: [PATCH 1/3] Revert "fard" This reverts commit 09d0eeeba9a1f7aa1c8616b8d40dd47376c704d5. --- code/datums/traits/negative.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 79133c26aa6..4a629403a27 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -1722,10 +1722,11 @@ Edit: TK~ This is the dumbest fucking shit I've ever seen in my life. This isn mob_trait = TRAIT_50_RAD_WEAK locked = FALSE +/* /datum/quirk/toxinlover - name = "Toxin Inversion" + name = "Toxin Lover" desc = "Your biology is hyperadapted to toxins to the point where you process them the opposite of any normal organic, \ - Magic will actively harm you, and taking this as a syntheric forfiets your right to life(Dont). This quirk is not for the faint of heart as you will usually end up RR'ed if dead to toxins." + however most healing magic and chemicals will quickly kill you or drain your blood. This is not a system reccomended for magic users." value = -34 category = "Health Quirks" mechanics = "You heal and regenerate toxin damage from toxic chemicals, but are harmed by anything that would normally fix toxin damage. With the existance of mages and the hunting horn, this is a burden to bare." @@ -1733,6 +1734,7 @@ Edit: TK~ This is the dumbest fucking shit I've ever seen in my life. This isn ) mob_trait = TRAIT_TOXINLOVER - gain_text = span_boldannounce("You have opted to take the toxinlover system of damage, your toxin damage will be an inverse of normal, with most hazardous chemicals being beneficial, while healing medicine and magic quickly killing you. Be careful around mages and charcoal.") + gain_text = span_boldannounce("You have opted to take the toxinlover system of damage, your toxin damage will be an exact inverse of normal, with most hazardous chemicals being beneficial, while healing medicine and magic quickly killing you. Be careful around mages.") lose_text = span_notice("You are now operating under normal toxin damage systems.") - locked = FALSE + locked = TRUE +*/ From 0e36da94428be85e052659e83f763d518abc66db Mon Sep 17 00:00:00 2001 From: Jaeger <80431951+Kilmented@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:28:46 -0500 Subject: [PATCH 2/3] Reapply "fard" This reverts commit a88e547b2c89dbcbcd02b9e57c8c378867e18c2a. --- code/datums/traits/negative.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 4a629403a27..79133c26aa6 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -1722,11 +1722,10 @@ Edit: TK~ This is the dumbest fucking shit I've ever seen in my life. This isn mob_trait = TRAIT_50_RAD_WEAK locked = FALSE -/* /datum/quirk/toxinlover - name = "Toxin Lover" + name = "Toxin Inversion" desc = "Your biology is hyperadapted to toxins to the point where you process them the opposite of any normal organic, \ - however most healing magic and chemicals will quickly kill you or drain your blood. This is not a system reccomended for magic users." + Magic will actively harm you, and taking this as a syntheric forfiets your right to life(Dont). This quirk is not for the faint of heart as you will usually end up RR'ed if dead to toxins." value = -34 category = "Health Quirks" mechanics = "You heal and regenerate toxin damage from toxic chemicals, but are harmed by anything that would normally fix toxin damage. With the existance of mages and the hunting horn, this is a burden to bare." @@ -1734,7 +1733,6 @@ Edit: TK~ This is the dumbest fucking shit I've ever seen in my life. This isn ) mob_trait = TRAIT_TOXINLOVER - gain_text = span_boldannounce("You have opted to take the toxinlover system of damage, your toxin damage will be an exact inverse of normal, with most hazardous chemicals being beneficial, while healing medicine and magic quickly killing you. Be careful around mages.") + gain_text = span_boldannounce("You have opted to take the toxinlover system of damage, your toxin damage will be an inverse of normal, with most hazardous chemicals being beneficial, while healing medicine and magic quickly killing you. Be careful around mages and charcoal.") lose_text = span_notice("You are now operating under normal toxin damage systems.") - locked = TRUE -*/ + locked = FALSE From 957bd313709a938f1f7dc1385504a5c96555d283 Mon Sep 17 00:00:00 2001 From: Jaeger <80431951+Kilmented@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:20:24 -0500 Subject: [PATCH 3/3] random mob firing delay --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index bfa253b70ac..e0147e4daaa 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -735,7 +735,7 @@ addtimer(CALLBACK(src,PROC_REF(Shoot), A, spreadgun), i * auto_fire_delay) spreadgun += ranged_extra_spread_per_shot ThrowSomething(A) - ranged_cooldown = world.time + ranged_cooldown_time + ranged_cooldown = world.time + ranged_cooldown_time + rand(0,30) if(sound_after_shooting) addtimer(CALLBACK(usr, GLOBAL_PROC_REF(playsound), src, sound_after_shooting, 100, 0, 0), sound_after_shooting_delay, TIMER_STOPPABLE) if(projectiletype)