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

[MIRROR] Fix lava boats not accepting oars and remove unimplemented vehicle subtype. (#2390)

Browse Source 
* Merge pull request #55787 from Timberpoes/ridable-tweex

Fix lava boats not accepting oars and remove unimplemented vehicle subtype.

* Fix lava boats not accepting oars and remove unimplemented vehicle subtype.

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-12-31 01:39:21 +00:00
committed by GitHub
co-authored by 81Denton
parent ffae5ad475
commit 6ba8971cc4
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/lavaboat.dm
+1
View File
@@ -9,6 +9,7 @@
var/allowed_turf = /turf/open/lava
resistance_flags = LAVA_PROOF | FIRE_PROOF
can_buckle = TRUE
key_type = /obj/item/oar
/obj/vehicle/ridden/lavaboat/Initialize()
. = ..()
code/modules/vehicles/speedbike.dm
+8 -16
View File
@@ -1,12 +1,4 @@
/obj/vehicle/ridden/space
name = "Generic Space Vehicle!"
/obj/vehicle/ridden/space/Initialize()
. = ..()
// ryll fix this//
/obj/vehicle/ridden/space/speedbike
/obj/vehicle/ridden/speedbike
name = "Speedbike"
icon = 'icons/obj/bike.dmi'
icon_state = "speedbike_blue"
@@ -14,24 +6,24 @@
var/overlay_state = "cover_blue"
var/mutable_appearance/overlay
/obj/vehicle/ridden/space/speedbike/Initialize()
/obj/vehicle/ridden/speedbike/Initialize()
. = ..()
overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
add_overlay(overlay)
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/speedbike)
/obj/vehicle/ridden/space/speedbike/Move(newloc,move_dir)
/obj/vehicle/ridden/speedbike/Move(newloc,move_dir)
if(has_buckled_mobs())
new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc,move_dir)
return ..()
/obj/vehicle/ridden/space/speedbike/red
/obj/vehicle/ridden/speedbike/red
icon_state = "speedbike_red"
overlay_state = "cover_red"
//BM SPEEDWAGON
/obj/vehicle/ridden/space/speedwagon
/obj/vehicle/ridden/speedwagon
name = "BM Speedwagon"
desc = "Push it to the limit, walk along the razor's edge."
icon = 'icons/obj/car.dmi'
@@ -43,12 +35,12 @@
pixel_y = -48
pixel_x = -48
/obj/vehicle/ridden/space/speedwagon/Initialize()
/obj/vehicle/ridden/speedwagon/Initialize()
. = ..()
add_overlay(overlay)
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/speedwagon)
/obj/vehicle/ridden/space/speedwagon/Bump(atom/A)
/obj/vehicle/ridden/speedwagon/Bump(atom/A)
. = ..()
if(!A.density || !has_buckled_mobs())
return
@@ -70,7 +62,7 @@
visible_message("<span class='danger'>[src] crashes into [H]!</span>")
playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
/obj/vehicle/ridden/space/speedwagon/Moved()
/obj/vehicle/ridden/speedwagon/Moved()
. = ..()
if(!has_buckled_mobs())
return