From 34cdc1dcebe9f1ae5643eb62ed696532d45f8aa6 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 17 Mar 2019 11:25:02 +0100 Subject: [PATCH 1/5] removes the force movement of dview --- code/__HELPERS/unsorted.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 97978fe6832..32d13920aad 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1487,7 +1487,8 @@ var/mob/dview/dview_mob = new /mob/dview invisibility = 101 density = 0 - + move_force = 0 + pull_force = 0 move_resist = INFINITY simulated = 0 From 288f52bbafefc37144b0b5edb543b10012f61b26 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 17 Mar 2019 11:34:05 +0100 Subject: [PATCH 2/5] added the canmove --- code/__HELPERS/unsorted.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 32d13920aad..d9039e8c004 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1491,7 +1491,7 @@ var/mob/dview/dview_mob = new pull_force = 0 move_resist = INFINITY simulated = 0 - + canmove = FALSE see_in_dark = 1e6 /mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox From 9eef7fe1f7f93a804d246bea16fd32b0e9b25a79 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 17 Mar 2019 13:48:16 +0100 Subject: [PATCH 3/5] no fastmos for the dview --- code/__HELPERS/unsorted.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index d9039e8c004..2596e0ad8ed 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1494,6 +1494,9 @@ var/mob/dview/dview_mob = new canmove = FALSE see_in_dark = 1e6 +/mob/dview/experience_pressure_difference() + return 0 + /mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox /mob/dview/Destroy() From 675ef68422ac608d5a2052c3a82b99a1e706d29f Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 17 Mar 2019 14:41:31 +0100 Subject: [PATCH 4/5] uses move resist now --- code/LINDA/LINDA_turf_tile.dm | 2 +- code/__HELPERS/unsorted.dm | 3 --- code/modules/mob/dead/observer/observer.dm | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index bb212b17138..4cefc75d1ba 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -311,7 +311,7 @@ /atom/movable/proc/experience_pressure_difference(pressure_difference, direction) if(last_forced_movement >= SSair.times_fired) return 0 - else if(!anchored && !pulledby) + else if((!anchored || move_resist == INFINITY) && !pulledby) var/turf/target = get_turf(src) var/datum/gas_mixture/target_air = target.return_air() if(isspaceturf(target) || isunsimulatedturf(target) || pressure_resistance > target_air.return_pressure()) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2596e0ad8ed..d9039e8c004 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1494,9 +1494,6 @@ var/mob/dview/dview_mob = new canmove = FALSE see_in_dark = 1e6 -/mob/dview/experience_pressure_difference() - return 0 - /mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox /mob/dview/Destroy() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 7d396a7e7ea..e91c79e46c9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -235,9 +235,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ..() -/mob/dead/observer/experience_pressure_difference() - return 0 - /mob/dead/observer/can_use_hands() return 0 /mob/dead/observer/Stat() From 713ff0f6b3c435ad10ad8dd9eefa2066e5fb681e Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 17 Mar 2019 14:41:53 +0100 Subject: [PATCH 5/5] != damnit --- code/LINDA/LINDA_turf_tile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 4cefc75d1ba..593b19b147c 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -311,7 +311,7 @@ /atom/movable/proc/experience_pressure_difference(pressure_difference, direction) if(last_forced_movement >= SSair.times_fired) return 0 - else if((!anchored || move_resist == INFINITY) && !pulledby) + else if((!anchored || move_resist != INFINITY) && !pulledby) var/turf/target = get_turf(src) var/datum/gas_mixture/target_air = target.return_air() if(isspaceturf(target) || isunsimulatedturf(target) || pressure_resistance > target_air.return_pressure())