shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5571 from Citadel-Station-13/upstream-merge-35739

Browse Source 
[MIRROR] Fixes bicycle riding
This commit is contained in:
deathride58
2018-02-19 00:46:57 +00:00
committed by GitHub
parent 7063a07e6b dac26732e2
commit fb289cfa5e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs.dm
+1 -1
View File
@@ -1817,6 +1817,6 @@
/datum/supply_pack/misc/bicycle
name = "Bicycle"
cost = 1000000
contains = list(/obj/vehicle/bicycle)
contains = list(/obj/vehicle/ridden/bicycle)
crate_name = "Bicycle Crate"
crate_type = /obj/structure/closet/crate/large
code/modules/vehicles/bicycle.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/obj/vehicle/bicycle
/obj/vehicle/ridden/bicycle
name = "bicycle"
desc = "Keep away from electricity."
icon_state = "bicycle"
@@ -8,23 +8,23 @@
'sound/misc/bike2.mid',
'sound/misc/bike3.mid')
/obj/vehicle/bicycle/Initialize()
/obj/vehicle/ridden/bicycle/Initialize()
. = ..()
var/datum/component/riding/D = LoadComponent(/datum/component/riding)
D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4)))
D.vehicle_move_delay = 0
/obj/vehicle/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1)
/obj/vehicle/ridden/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1)
if(prob(easter_egg_chance) || (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
SEND_SOUND(M, sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = CHANNEL_BICYCLE))
. = ..()
/obj/vehicle/bicycle/unbuckle_mob(mob/living/buckled_mob,force = 0)
/obj/vehicle/ridden/bicycle/unbuckle_mob(mob/living/buckled_mob,force = 0)
if(buckled_mob)
buckled_mob.stop_sound_channel(CHANNEL_BICYCLE)
. =..()
/obj/vehicle/bicycle/tesla_act() // :::^^^)))
/obj/vehicle/ridden/bicycle/tesla_act() // :::^^^)))
name = "fried bicycle"
desc = "Well spent."
color = rgb(63, 23, 4)
code/modules/vehicles/ridden.dm
+2 -1
View File
@@ -13,7 +13,8 @@
/obj/vehicle/ridden/examine(mob/user)
. = ..()
to_chat(user, "<span class='notice'>Put a key inside it by clicking it with the key. If there's a key inside, you can remove it via Alt-Click!</span>")
if(key_type)
to_chat(user, "<span class='notice'>Put a key inside it by clicking it with the key. If there's a key inside, you can remove it via Alt-Click!</span>")
/obj/vehicle/ridden/generate_action_type(actiontype)
var/datum/action/vehicle/ridden/A = ..()