From 10deb189e15af5336c478830520651f676d5be86 Mon Sep 17 00:00:00 2001
From: HahaNo <64060-HahaNo@users.noreply.gitgud.io>
Date: Sat, 11 Jan 2025 11:56:44 +0000
Subject: [PATCH] shift
---
code/modules/mob/living/carbon/human/human.dm | 1 -
.../mob/living/carbon/human/human_attackhand.dm | 2 --
.../mob/living/simple_animal/friendly/farm_animals.dm | 10 ++++++++++
code/modules/mob/mob_grab.dm | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 214c60d009a..ebb8110ca9f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -738,7 +738,6 @@
spawn(150) //15 seconds until second warning
src << "<span class='warning'>You feel like you are about to throw up!</span>"
spawn(100) //and you have 10 more for mad dash to the bucket
- Stun(5)
src.visible_message("<span class='warning'>[src] throws up!</span>","<span class='warning'>You throw up!</span>")
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 003fc163b8d..88904f64ff9 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -15,8 +15,6 @@
H << "\red You can't use your hand."
return
- ..()
-
// Should this all be in Touch()?
if(istype(H))
if((H != src) && check_shields(0, H.name))
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index bba910ce576..363abe5bed3 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -319,6 +319,9 @@ var/global/chicken_count = 0
user << "\blue [name] doesn't seem hungry!"
else
user << "[name] doesn't seem interested in that."
+ else if (user.a_intent == I_HURT && prob(5))
+ usr << "\red <b><font size=3>Death to kiwi hurting niggers.</font></b>"
+ user.gib()
else
..()
@@ -335,3 +338,10 @@ var/global/chicken_count = 0
E.species = /mob/living/simple_animal/kiwi
if(chicken_count < MAX_CHICKENS && prob(10))
processing_objects.Add(E)
+
+/mob/living/simple_animal/kiwi/attack_hand(var/mob/user as mob)
+ if (user.a_intent == I_HURT && prob(5))
+ usr << "\red <b><font size=3>Death to kiwi kicking niggers.</font></b>"
+ user.gib()
+ else
+ ..()
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index c76c3bb0aea..9f63a93df2d 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -262,7 +262,7 @@
msg_admin_attack("[key_name(assailant)] grabbed the neck of [key_name(affecting)]", affecting)
hud.icon_state = "kill"
hud.name = "kill"
- affecting.Stun(10) //10 ticks of ensured grab
+ affecting.Stun(5) //5 ticks of ensured grab
else if(state < GRAB_UPGRADING)
assailant.visible_message("<span class='danger'>[assailant] starts to tighten \his grip on [affecting]'s neck!</span>")
hud.icon_state = "kill1"
--
GitLab