Skip to content

tweak/balance: атропин теперь не даёт имплантам бомбы взорватся при смерти #8535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dageavtobusnick merged 6 commits into from
Feb 28, 2026
Merged

tweak/balance: атропин теперь не даёт имплантам бомбы взорватся при смерти #8535

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efd5704
first changes
shahribek Feb 25, 2026
592d0fe
added atropine into medic duffel
shahribek Feb 25, 2026
127e07f
quick fix
shahribek Feb 25, 2026
7e458a8
made macro-bomb more usefull
shahribek Feb 25, 2026
ee7ff97
quick linter fix
shahribek Feb 25, 2026
0e6d755
more understandable comment
shahribek Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/traits/declarations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,3 +425,6 @@
#define TRAIT_TIME_STOP_IMMUNE "time_stop_immune"

#define TRAIT_LUNGE_HAS_ATTACKED "trait_lunge_has_attacked"

// prevents explosion implants from auto activating upon death
#define TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION "prevent_implant_auto_explosion"

Check failure on line 430 in code/__DEFINES/traits/declarations.dm

View workflow job for this annotation

GitHub Actions / Run Linters / Linters

Trait Sanity 

Trait 'TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION' is defined but not added to code/_globalvars/traits/_traits.dm!
4 changes: 3 additions & 1 deletion code/game/objects/items/weapons/implants/implant_explosive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
var/delay = (0.7 SECONDS)

/obj/item/implant/explosive/death_trigger(mob/source, gibbed)
activate("death")
if(!HAS_TRAIT(imp_in, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION))
activate("death")

/obj/item/implant/explosive/activate(cause)
if(!cause || QDELETED(imp_in))
Expand Down Expand Up @@ -97,6 +98,7 @@
name = "macrobomb bio-chip"
desc = "And boom goes the weasel. And everything else nearby."
origin_tech = "materials=3;combat=5;biotech=4;syndicate=5"
trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY // At least some usefull function
weak = 16
medium = 8
heavy = 4
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ TODO Use this name and desc for localisation*/
new /obj/item/bodyanalyzer/advanced(src)
new /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/reagent_containers/glass/bottle/atropine(src)

/obj/item/storage/backpack/duffel/syndie/c4/populate_contents()
for(var/i in 1 to 10)
Expand Down
1 change: 1 addition & 0 deletions code/modules/reagents/chemistry/reagents/medicine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@
overdose_threshold = 25
harmless = FALSE
taste_description = "передышки"
metabolized_traits = list(TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION)

/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
Expand Down
Loading