cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+2 -3
View File
@@ -262,9 +262,8 @@
return FALSE
COOLDOWN_START(src, area_scan_cooldown, 15 SECONDS)
for(var/mob/living/driver in chassis.return_drivers())
for(var/obj/structure/ore_vent/vent as anything in range(5, chassis))
if(istype(vent, /obj/structure/ore_vent))
vent.scan_and_confirm(driver, TRUE)
for(var/obj/structure/ore_vent/vent in range(5, chassis))
vent.scan_and_confirm(driver, TRUE)
return TRUE
#undef DRILL_BASIC
code/modules/vehicles/scooter.dm
+2 -2
View File
@@ -168,8 +168,8 @@
if (over_object == skater)
pick_up_board(skater)
/obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/skater)
if (skater.incapacitated || !Adjacent(skater))
/obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/skater, forced = FALSE)
if ((skater.incapacitated || !Adjacent(skater)) && !forced)
return
if(has_buckled_mobs())
to_chat(skater, span_warning("You can't lift this up when somebody's on it."))
code/modules/vehicles/vehicle_actions.dm
+2 -1
View File
@@ -409,7 +409,8 @@
animate(board, pixel_z = 6, time = 0.3 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
animate(pixel_z = -6, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
board.unbuckle_mob(rider)
addtimer(CALLBACK(board, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard, pick_up_board), rider), 0.5 SECONDS) // so the board can still handle "picking it up"
rider.Immobilize(0.5 SECONDS)
addtimer(CALLBACK(board, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard, pick_up_board), rider, TRUE), 0.5 SECONDS) // so the board can still handle "picking it up"