From 4bbe041ac8e4311a311fbf9305f9a771f54336cb Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sat, 17 Feb 2024 20:29:12 +0100
Subject: [PATCH] Removes the stun from "????" (#23951)
* ???? lets you vomit instead of being hardstunned
* Fuck it I'm not touching this hornet's nest
* Only vomits if you don't have food poisoning
---
code/modules/paperwork/pen.dm | 5 +----
code/modules/projectiles/projectile/bullets.dm | 5 +----
code/modules/reagents/chemistry/reagents/food_reagents.dm | 3 ++-
code/modules/reagents/reagent_containers/hypospray.dm | 5 +----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 83def2f64a9..9ce82fb8993 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -130,10 +130,7 @@
transfered = reagents.trans_to(M, transfer_amount)
to_chat(user, "You sneakily stab [M] with the pen.")
add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered from pen containing [english_list(contained)].")
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
return TRUE
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index c2325caf7ce..01c719abfff 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -228,10 +228,7 @@
if(M.can_inject(null, FALSE, hit_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
..()
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
reagents.trans_to(M, reagents.total_volume)
return TRUE
else
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 6ff6e2acbcf..496cbf3fdd4 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -844,8 +844,9 @@
/datum/reagent/questionmark/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume)
if(istype(H) && method == REAGENT_INGEST)
if(H.dna.species.taste_sensitivity < TASTE_SENSITIVITY_NO_TASTE) // If you can taste it, then you know how awful it is.
- H.Weaken(4 SECONDS)
to_chat(H, "Ugh! Eating that was a terrible idea!")
+ if(!H.HasDisease(/datum/disease/food_poisoning))
+ H.fakevomit(no_text = TRUE)
if(HAS_TRAIT(H, TRAIT_NOHUNGER)) //If you don't eat, then you can't get food poisoning
return
H.ForceContractDisease(new /datum/disease/food_poisoning(0))
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 3552d20f27c..ccffe1dcab9 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -51,10 +51,7 @@
var/contained = english_list(injected)
add_attack_logs(user, M, "Injected with [src] containing ([contained])", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
return TRUE
/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)