From 9c7a528c5833e5306f98f2899255e08fd81970b0 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 22 Jul 2021 01:10:06 -0400 Subject: [PATCH 1/4] Update wheelchair.dm --- code/modules/vehicles/wheelchair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 922ba908f139..bb9d678bcd67 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -45,7 +45,7 @@ //1.5 (movespeed as of this change) multiplied by 4 gets 6, which gives you a delay of 3 assuming the user has two arms, //getting the speed of the wheelchair roughly equal to the speed of a scooter based on testing. //if that made no sense this simply makes the wheelchair speed change along with movement speed delay - D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2) + D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 3) / min(user.get_num_arms(), 2) return ..() /obj/vehicle/ridden/wheelchair/Moved() From b2467a965d7adb7ca1be900abe6a55abf790f20d Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 22 Jul 2021 01:10:22 -0400 Subject: [PATCH 2/4] Update wheelchair.dm --- code/modules/vehicles/wheelchair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index bb9d678bcd67..922ba908f139 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -45,7 +45,7 @@ //1.5 (movespeed as of this change) multiplied by 4 gets 6, which gives you a delay of 3 assuming the user has two arms, //getting the speed of the wheelchair roughly equal to the speed of a scooter based on testing. //if that made no sense this simply makes the wheelchair speed change along with movement speed delay - D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 3) / min(user.get_num_arms(), 2) + D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2) return ..() /obj/vehicle/ridden/wheelchair/Moved() From 798b8aaf4312ec2a8a428da535dd566fdac26ec5 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sun, 8 Aug 2021 22:29:08 -0400 Subject: [PATCH 3/4] i change a single number --- _maps/map_files/YogStation/YogStation.dmm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index ffb8d693cd1e..1107ed35a306 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -35828,12 +35828,6 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) -"eDw" = ( -/obj/structure/fireaxecabinet/spare{ - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) "eDG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -50588,6 +50582,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"ovR" = ( +/obj/structure/fireaxecabinet/spare{ + pixel_y = 32; + req_access = list(20) + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) "owV" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -97872,7 +97873,7 @@ bfl bim bjG aZV -eDw +ovR qWH kSk bqH From 5cdf7f728e7fc50e402a5a57701808b9fbc07099 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sun, 8 Aug 2021 22:37:59 -0400 Subject: [PATCH 4/4] i update all maps before adam tells me --- .../EclipseStation/EclipseStation.dmm | 15 ++++----- _maps/map_files/IceBox/IceBox.dmm | 23 +++++++------- _maps/map_files/KiloStation/KiloStation.dmm | 31 ++++++++++--------- _maps/map_files/Omegastation/omegastation.dmm | 31 ++++++++++--------- _maps/map_files/YogsDelta/YogsDelta.dmm | 23 +++++++------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 23 +++++++------- 6 files changed, 76 insertions(+), 70 deletions(-) diff --git a/_maps/map_files/EclipseStation/EclipseStation.dmm b/_maps/map_files/EclipseStation/EclipseStation.dmm index d791939f5081..148ad12bfbad 100644 --- a/_maps/map_files/EclipseStation/EclipseStation.dmm +++ b/_maps/map_files/EclipseStation/EclipseStation.dmm @@ -83667,12 +83667,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"jfR" = ( -/obj/structure/fireaxecabinet/spare{ - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain/private) "jiO" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/red{ @@ -87276,6 +87270,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"rpL" = ( +/obj/structure/fireaxecabinet/spare{ + pixel_y = 32; + req_access = list(20) + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "rqB" = ( /obj/structure/closet, /obj/structure/window/reinforced{ @@ -127046,7 +127047,7 @@ aTa aTY aVe aif -jfR +rpL aZz ceY aTa diff --git a/_maps/map_files/IceBox/IceBox.dmm b/_maps/map_files/IceBox/IceBox.dmm index 552c2056e01b..ef873d43abb6 100644 --- a/_maps/map_files/IceBox/IceBox.dmm +++ b/_maps/map_files/IceBox/IceBox.dmm @@ -57915,6 +57915,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) +"gOQ" = ( +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/structure/fireaxecabinet/spare{ + pixel_x = 2; + pixel_y = 32; + req_access = list(20) + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) "gQJ" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light/small{ @@ -58804,16 +58815,6 @@ /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel, /area/science/xenobiology) -"jrE" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/structure/fireaxecabinet/spare{ - pixel_x = 2; - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) "jrL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -97253,7 +97254,7 @@ bfl bim bjG aZV -jrE +gOQ aCd bpl bqH diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3fa427ee5f53..664ae70d826d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -91486,6 +91486,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/crew_quarters/toilet/restrooms) +"jba" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/closet/secure_closet/captains, +/obj/effect/turf_decal/bot, +/obj/structure/fireaxecabinet/spare{ + pixel_x = 32; + req_access = list(20) + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) "jeG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -99076,20 +99091,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"seE" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/closet/secure_closet/captains, -/obj/effect/turf_decal/bot, -/obj/structure/fireaxecabinet/spare{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) "seX" = ( /obj/machinery/door/airlock/command{ name = "Armoury"; @@ -137670,7 +137671,7 @@ bwk asx omq bCz -seE +jba epd xlT brU diff --git a/_maps/map_files/Omegastation/omegastation.dmm b/_maps/map_files/Omegastation/omegastation.dmm index 3513709da2d5..87c505a1770a 100644 --- a/_maps/map_files/Omegastation/omegastation.dmm +++ b/_maps/map_files/Omegastation/omegastation.dmm @@ -20338,20 +20338,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint) -"aXF" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/structure/table/wood, -/obj/item/phone/real, -/obj/structure/fireaxecabinet/spare{ - pixel_x = 32 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain/private) "aXK" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small{ @@ -37286,6 +37272,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"pPm" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/table/wood, +/obj/item/phone/real, +/obj/structure/fireaxecabinet/spare{ + pixel_x = 32; + req_access = list(20) + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "pPL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ @@ -86651,7 +86652,7 @@ aae abw acc acS -aXF +pPm aer afo msP diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index e468ef9c2d88..c7bcf7309834 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -125949,16 +125949,6 @@ /obj/effect/mapping_helpers/teleport_anchor, /turf/open/floor/plasteel, /area/science/xenobiology) -"nkh" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/item/storage/secure/safe{ - pixel_x = 32 - }, -/obj/structure/fireaxecabinet/spare{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/heads/captain/private) "now" = ( /turf/closed/wall, /area/storage/art) @@ -126725,6 +126715,17 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/crew_quarters/heads/chief) +"qfL" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/item/storage/secure/safe{ + pixel_x = 32 + }, +/obj/structure/fireaxecabinet/spare{ + pixel_y = 32; + req_access = list(20) + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/heads/captain/private) "qhc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -171302,7 +171303,7 @@ bUQ bVT dkH cbg -nkh +qfL ceL cgy bUQ diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 2b4f6b99bf1d..bbc8e01fa84f 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -76390,16 +76390,6 @@ /obj/structure/table/optable, /turf/open/floor/plasteel, /area/medical/surgery) -"jYH" = ( -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/fireaxecabinet/spare{ - pixel_x = 32 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain/private) "kac" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/screwdriver{ @@ -79194,6 +79184,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"pPS" = ( +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/fireaxecabinet/spare{ + pixel_x = 32; + req_access = list(20) + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "pPV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -115156,7 +115157,7 @@ aMw bcj bdN yeQ -jYH +pPS bjk pim bjg