Merge remote-tracking branch 'bay12-upstream/master' into development

code/modules/vehicles/bike.dm

@@ -0,0 +1,142 @@
+/obj/vehicle/bike/
+	name = "space-bike"
+	desc = "Space wheelies! Woo! "
+	icon = 'icons/obj/bike.dmi'
+	icon_state = "bike_off"
+	dir = SOUTH
+
+	load_item_visible = 1
+	mob_offset_y = 5
+	health = 100
+	maxhealth = 100
+
+	fire_dam_coeff = 0.6
+	brute_dam_coeff = 0.5
+	var/protection_percent = 60
+
+	var/land_speed = 10 //if 0 it can't go on turf
+	var/space_speed = 1
+	var/bike_icon = "bike"
+
+	var/datum/effect/effect/system/ion_trail_follow/ion
+	var/kickstand = 1
+
+/obj/vehicle/bike/New()
+	..()
+	ion = new /datum/effect/effect/system/ion_trail_follow()
+	ion.set_up(src)
+	turn_off()
+	overlays += image('icons/obj/bike.dmi', "[icon_state]_off_overlay", MOB_LAYER + 1)
+	icon_state = "[bike_icon]_off"
+
+/obj/vehicle/bike/verb/toggle()
+	set name = "Toggle Engine"
+	set category = "Vehicle"
+	set src in view(0)
+
+	if(usr.incapacitated()) return
+
+	if(!on)
+		turn_on()
+		src.visible_message("\The [src] rumbles to life.", "You hear something rumble deeply.")
+	else
+		turn_off()
+		src.visible_message("\The [src] putters before turning off.", "You hear something putter slowly.")
+
+/obj/vehicle/bike/verb/kickstand()
+	set name = "Toggle Kickstand"
+	set category = "Vehicle"
+	set src in view(0)
+
+	if(usr.incapacitated()) return
+
+	if(kickstand)
+		src.visible_message("You put up \the [src]'s kickstand.")
+	else
+		if(istype(src.loc,/turf/space))
+			usr << "<span class='warning'> You don't think kickstands work in space...</span>"
+			return
+		src.visible_message("You put down \the [src]'s kickstand.")
+		if(pulledby)
+			pulledby.stop_pulling()
+
+	kickstand = !kickstand
+	anchored = (kickstand || on)
+
+/obj/vehicle/bike/load(var/atom/movable/C)
+	var/mob/living/M = C
+	if(!istype(C)) return 0
+	if(M.buckled || M.restrained() || !Adjacent(M) || !M.Adjacent(src))
+		return 0
+	return ..(M)
+
+/obj/vehicle/bike/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+	if(!load(C))
+		user << "<span class='warning'> You were unable to load \the [C] onto \the [src].</span>"
+		return
+
+/obj/vehicle/bike/attack_hand(var/mob/user as mob)
+	if(user == load)
+		unload(load)
+		user << "You unbuckle yourself from \the [src]"
+
+/obj/vehicle/bike/relaymove(mob/user, direction)
+	if(user != load || !on)
+		return
+	return Move(get_step(src, direction))
+
+/obj/vehicle/bike/Move(var/turf/destination)
+	if(kickstand) return
+
+
+	//these things like space, not turf. Dragging shouldn't weigh you down.
+	if(istype(destination,/turf/space) || pulledby)
+		if(!space_speed)
+			return 0
+		move_delay = space_speed
+	else
+		if(!land_speed)
+			return 0
+		move_delay = land_speed
+	return ..()
+
+/obj/vehicle/bike/turn_on()
+	ion.start()
+	anchored = 1
+
+	update_icon()
+
+	if(pulledby)
+		pulledby.stop_pulling()
+	..()
+/obj/vehicle/bike/turn_off()
+	ion.stop()
+	anchored = kickstand
+
+	update_icon()
+
+	..()
+
+/obj/vehicle/bike/bullet_act(var/obj/item/projectile/Proj)
+	if(buckled_mob && prob(protection_percent))
+		buckled_mob.bullet_act(Proj)
+		return
+	..()
+
+/obj/vehicle/bike/update_icon()
+	overlays.Cut()
+
+	if(on)
+		overlays += image('icons/obj/bike.dmi', "[bike_icon]_on_overlay", MOB_LAYER + 1)
+		icon_state = "[bike_icon]_on"
+	else
+		overlays += image('icons/obj/bike.dmi', "[bike_icon]_off_overlay", MOB_LAYER + 1)
+		icon_state = "[bike_icon]_off"
+
+	..()
+
+
+/obj/vehicle/bike/Destroy()
+	qdel(ion)
+
+	..()

code/modules/vehicles/vehicle.dm

@@ -93,6 +93,7 @@
 			if(health < maxhealth)
 				if(open)
 					health = min(maxhealth, health+10)
+					user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 					user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
 				else
 					user << "<span class='notice'>Unable to repair with the maintenance panel closed.</span>"
@@ -100,9 +101,8 @@
 				user << "<span class='notice'>[src] does not need a repair.</span>"
 		else
 			user << "<span class='notice'>Unable to repair while [src] is off.</span>"
-	else if(istype(W, /obj/item/weapon/card/emag) && !emagged)
-		Emag(user)
 	else if(hasvar(W,"force") && hasvar(W,"damtype"))
+		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		switch(W.damtype)
 			if("fire")
 				health -= W.force * fire_dam_coeff
@@ -114,8 +114,7 @@
 		..()
 
 /obj/vehicle/bullet_act(var/obj/item/projectile/Proj)
-	if (Proj.damage_type == BRUTE || Proj.damage_type == BURN)
-		health -= Proj.damage
+	health -= Proj.get_structure_damage()
 	..()
 
 	if (prob(20))
@@ -123,15 +122,6 @@
 
 	healthcheck()
 
-/obj/vehicle/meteorhit()
-	explode()
-	return
-
-/obj/vehicle/blob_act()
-	src.health -= rand(20,40)*fire_dam_coeff
-	healthcheck()
-	return
-
 /obj/vehicle/ex_act(severity)
 	switch(severity)
 		if(1.0)
@@ -194,12 +184,13 @@
 	set_light(0)
 	update_icon()
 
-/obj/vehicle/proc/Emag(mob/user as mob)
-	emagged = 1
-
-	if(locked)
-		locked = 0
-		user << "<span class='warning'>You bypass [src]'s controls.</span>"
+/obj/vehicle/emag_act(var/remaining_charges, mob/user as mob)
+	if(!emagged)
+		emagged = 1
+		if(locked)
+			locked = 0
+			user << "<span class='warning'>You bypass [src]'s controls.</span>"
+		return 1
 
 /obj/vehicle/proc/explode()
 	src.visible_message("\red <B>[src] blows apart!</B>", 1)