cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

addresses reviews on the tram pr made after merge, fixes diagonal movement bugs (#68033)

Browse Source
This commit is contained in:
Kylerace
2022-07-16 21:44:41 -07:00
committed by GitHub
parent b31c605690
commit fe7513d282
65 changed files with 136 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/bed.dm
+1 -1
View File
@@ -105,7 +105,7 @@
//Push them up from the normal lying position
M.pixel_y = M.base_pixel_y
/obj/structure/bed/roller/Moved()
/obj/structure/bed/roller/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(has_gravity())
playsound(src, 'sound/effects/roll.ogg', 100, TRUE)
code/game/objects/structures/beds_chairs/chair.dm
+2 -2
View File
@@ -238,7 +238,7 @@
icon_state = "officechair_dark"
/obj/structure/chair/office/Moved()
/obj/structure/chair/office/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(has_gravity())
playsound(src, 'sound/effects/roll.ogg', 100, TRUE)
@@ -463,7 +463,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
if(turns >= 8)
STOP_PROCESSING(SSfastprocess, src)
/obj/structure/chair/bronze/Moved()
/obj/structure/chair/bronze/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(has_gravity())
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -146,7 +146,7 @@
icon_state = "trashcart"
can_install_electronics = FALSE
/obj/structure/closet/crate/trashcart/Moved()
/obj/structure/closet/crate/trashcart/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(has_gravity())
playsound(src, 'sound/effects/roll.ogg', 100, TRUE)
code/game/objects/structures/tables_racks.dm
+5 -6
View File
@@ -356,16 +356,15 @@
attached_items -= source
UnregisterSignal(source, COMSIG_MOVABLE_MOVED)
/obj/structure/table/rolling/Moved(atom/OldLoc, Dir)
/obj/structure/table/rolling/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
if(!loc)
return
for(var/mob/living/living_mob in OldLoc.contents)//Kidnap everyone on top
for(var/mob/living/living_mob in old_loc.contents)//Kidnap everyone on top
living_mob.forceMove(loc)
for(var/x in attached_items)
var/atom/movable/AM = x
if(!AM.Move(loc))
RemoveItemFromTable(AM, AM.loc)
for(var/atom/movable/attached_movable as anything in attached_items)
if(!attached_movable.Move(loc))
RemoveItemFromTable(attached_movable, attached_movable.loc)
/*
* Glass tables