From 04debb2c205f5555b4dfdd89188e5f0c181ec0db Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 14 Mar 2021 00:27:26 +0000 Subject: [PATCH 1/2] Automatic changelog compile [ci skip] --- html/changelog.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index e277c9fbe1..faf80f3435 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -52,6 +52,24 @@

06 June 2021

bunny232 updated:

+

14 March 2021

+

Adelphon updated:

+ +

Hatterhat updated:

+ +

Putnam3145 updated:

+ + +

12 March 2021

+

R3dtail updated:

@@ -72,6 +90,8 @@

04 June 2021

MrJWhit updated:

+

10 March 2021

+

Hatterhat updated:

From 20bc2f2f59dee2a18e8a72e6a5b0f521b0a97670 Mon Sep 17 00:00:00 2001 From: 123 Date: Thu, 17 Jun 2021 16:16:21 -0700 Subject: [PATCH 2/2] Update scooter.dm --- code/modules/vehicles/scooter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 1fb037d1c5..3e0e71446d 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -256,7 +256,7 @@ /obj/vehicle/ridden/scooter/wheelys/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 1 D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(NORTH, OBJ_LAYER) D.set_vehicle_dir_layer(EAST, OBJ_LAYER) @@ -280,7 +280,7 @@ unbuckle_mob(H) H.throw_at(throw_target, 4, 3) H.DefaultCombatKnockdown(30) - H.adjustStaminaLoss(10) + H.adjustStaminaLoss(30) var/head_slot = H.get_item_by_slot(SLOT_HEAD) if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1)