mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom * wew * a * b * morestuff * . * a * . * . * basicsprites+extend/retract * ... * . * thanks travis * woops * thankstravisv2 * redundence * ishouldstopmakingsomanygoddamncommits+empdamage * stuff * .. * ion_trails * fixes_conflict_1 * fix * compilesnow * . * fuck * WIP: Multi Step Assembly * thismightfixitthismightnot * shoe-attachment * noselfremoval * wooops * tweaksandcrashing * runtimes * runtimesfuntimes+crash update 1 * thisprobablywontcompile * stillwip * githubPLEASEWORK * fixes conflicts 3/3 * REFACTORSUNTESTED * fixingconflicts2 * fixingconflicts3/3 * updates * stuffs * ... * stillWIP * stufffs * . * .. * runtimesfuntimes2 * stuffs2 * conflictfix * ... * fuck * fix * bah merge conflicts * knockback_testing1 * conflictfixing... * mergeconflicts * plop * socloseyetsofar * tweaksandfixes * conflicts * fix * fixes * fix * woops * woops2 * hotfix * ... * flufftextandfixes * test * .. * fix1/2 * stuff * finallysomeoneteachesmehowtofixthisshit * FIX * why * . * bitflagsshitflags1 * bitflags-shitflags2 * bitflags-shitflags2 * bitflags_shitflags_4 * autofloating * minerbuffgetthepun? * notouchingfloors * ... * . * f l o a t * kek * kek * fixes * fixes2 * sprites
This commit is contained in:
@@ -104,16 +104,15 @@
|
||||
|
||||
/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
|
||||
if(armed)
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/H = AM
|
||||
if(H.m_intent == "run")
|
||||
triggered(H)
|
||||
H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
|
||||
"<span class='warning'>You accidentally step on [src]</span>")
|
||||
else if(isanimal(AM))
|
||||
var/mob/living/simple_animal/SA = AM
|
||||
if(!SA.flying)
|
||||
triggered(AM)
|
||||
if(ismob(AM))
|
||||
var/mob/MM = AM
|
||||
if(!(MM.movement_type & FLYING))
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/H = AM
|
||||
if(H.m_intent == "run")
|
||||
triggered(H)
|
||||
H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
|
||||
"<span class='warning'>You accidentally step on [src]</span>")
|
||||
else if(AM.density) // For mousetrap grenades, set off by anything heavy
|
||||
triggered(AM)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user