diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index a21637b53b2..a178490bda8 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -185,7 +185,7 @@ /obj/vehicle/ridden/wheelchair/motorized/Bump(atom/bumped_atom) . = ..() // Here is the shitty emag functionality. - if(obj_flags & EMAGGED && (isclosedturf(bumped_atom) || isliving(bumped_atom))) + if((obj_flags & EMAGGED) && (isclosedturf(bumped_atom) || isliving(bumped_atom))) detonate_bomb() return // If the speed is higher than delay_multiplier throw the person on the wheelchair away diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index a81df59d89e..087a1c4e956 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -61,7 +61,7 @@ /// When you ring your bell and are armed try to explode /obj/vehicle/ridden/wheelchair/proc/on_bell_rang() SIGNAL_HANDLER - if (!prob(20)) + if (prob(80)) return detonate_bomb() @@ -71,7 +71,7 @@ if(!tool.use_tool(src, user, 4 SECONDS, volume=50)) return ITEM_INTERACT_SUCCESS to_chat(user, span_notice("You detach the wheels and deconstruct the chair.")) - deconstruct(TRUE) + deconstruct(disassembled = TRUE) qdel(src) return ITEM_INTERACT_SUCCESS @@ -99,6 +99,8 @@ return FALSE if(has_buckled_mobs()) return FALSE + remove_bell() + remove_bomb() user.visible_message(span_notice("[user] collapses [src]."), span_notice("You collapse [src].")) var/obj/vehicle/ridden/wheelchair/wheelchair_folded = new foldabletype(get_turf(src)) user.put_in_hands(wheelchair_folded)