[MIRROR] Unlucky trait (#11775)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-04 03:52:24 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 6eab8c8408
commit b8fe8fa68d
44 changed files with 1162 additions and 181 deletions
@@ -162,3 +162,10 @@
walk_away(src,temploc,stepdist)
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
/obj/item/grenade/flashbang/clusterbang/primed
desc = "This clusterbang seems to have already been activated. Uhoh."
/obj/item/grenade/flashbang/clusterbang/primed/Initialize(mapload)
. = ..()
activate()
@@ -37,3 +37,10 @@
var/new_smoke_color = tgui_color_picker(user, "Choose a color for the smoke:", "Smoke Color", smoke_color)
if(new_smoke_color)
smoke_color = new_smoke_color
/obj/item/grenade/smokebomb/primed
desc = "A smoke bomb. This one appears to be already activated!"
/obj/item/grenade/smokebomb/primed/Initialize(mapload)
. = ..()
activate()
+1 -1
View File
@@ -205,7 +205,7 @@
//stun effects
if(status)
target.stun_effect_act(stun, agony, hit_zone, src)
target.stun_effect_act(stun, agony, hit_zone, src, electric = TRUE)
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
if(ishuman(target))