mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
[no GBP] Wheelchair Bomb Fixes (#90440)
## About The Pull Request Two nitpicks and one fix from #90176 which were posted post-merge. Main thing is that the wheelchair will no longer delete bells/TTVs when folded, other things are just code cleanup. ## Changelog 🆑 fix: Folding a wheelchair will no longer destroy attached bells or bombs. /🆑
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user