From 2e22cf2c654f478ae3722b6dcb762bae00f15df9 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:29:34 -0400 Subject: [PATCH] Bikes Over Grates and Konyang Police Tape Fixes (#20616) Police tape allows Konyang Police (PV Police) to walk through Bikes can now drive over grates Should fix https://github.com/Aurorastation/Aurora.3/issues/5605 Co-authored-by: Ben10083 --- code/game/objects/items/weapons/policetape.dm | 2 +- code/modules/vehicles/bike.dm | 12 ++-- html/changelogs/Ben10083 - PV_Fixes.yml | 59 +++++++++++++++++++ 3 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/Ben10083 - PV_Fixes.yml diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index f561df0e9ac..d078d983403 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(tape_roll_applications, list()) /obj/item/tape/police name = "police tape" desc = "A length of police tape. Do not cross." - req_access = list(ACCESS_SECURITY) + req_one_access = list(ACCESS_SECURITY, ACCESS_KONYANG_POLICE) // Any role that is considered 'police' and gets this item should also have it's access added to this variable. If this list gets too long we may need to make subtypes. icon_base = "police" /obj/item/taperoll/medical diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 6877fcc112e..047c5301904 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -198,7 +198,7 @@ /obj/vehicle/bike/proc/check_destination(var/turf/destination) var/static/list/types = typecacheof(list(/turf/space)) - if(is_type_in_typecache(destination,types) || pulledby) + if((is_type_in_typecache(destination,types) && !locate(/obj/structure/lattice)) || pulledby) return TRUE else return FALSE @@ -217,11 +217,11 @@ if(is_on_space) if(!space_speed) - return 0 + return FALSE move_delay = (is_careful ? space_speed_careful : space_speed) else if(!land_speed) - return 0 + return FALSE move_delay = (is_careful ? land_speed_careful : land_speed) return ..() @@ -388,7 +388,7 @@ /obj/vehicle/bike/monowheel/check_destination(var/turf/destination) var/static/list/types = typecacheof(list(/turf/space)) - if(is_type_in_typecache(destination,types) || pulledby) + if((is_type_in_typecache(destination,types) && !locate(/obj/structure/lattice)) || pulledby) return TRUE else return FALSE @@ -436,7 +436,7 @@ /obj/vehicle/bike/casino/check_destination(var/turf/destination) var/static/list/types = typecacheof(list(/turf/space)) - if(is_type_in_typecache(destination,types) || pulledby) + if((is_type_in_typecache(destination,types) && !locate(/obj/structure/lattice)) || pulledby) return TRUE else return FALSE @@ -466,7 +466,7 @@ /obj/vehicle/bike/motor/check_destination(turf/destination) var/static/list/types = typecacheof(list(/turf/space, /turf/simulated/floor/exoplanet/water)) - if(is_type_in_typecache(destination,types) || pulledby) + if((is_type_in_typecache(destination,types) && !locate(/obj/structure/lattice)) || pulledby) return TRUE else return FALSE diff --git a/html/changelogs/Ben10083 - PV_Fixes.yml b/html/changelogs/Ben10083 - PV_Fixes.yml new file mode 100644 index 00000000000..ecdb5c578b5 --- /dev/null +++ b/html/changelogs/Ben10083 - PV_Fixes.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Point Verdant police now can pass through police tape." + - bugfix: "Bikes can now drive over lattice such as grates or catwalks without being considered as in space."