From e2ea09a1be8ba7e96b18a7270e0fb3798f4234ff Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 12 Oct 2019 12:10:04 -0400 Subject: [PATCH 01/10] Fixes open space spawning over sky tiles --- code/game/turfs/turf_changing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 8a0d7852f5..86ce5967c2 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -28,7 +28,7 @@ if(N == /turf/space) var/turf/below = GetBelow(src) - if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && !istype(below, /turf/unsimulated/wall)) // VOREStation Edit: Weird open space + if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) || !istype(below, /turf/simulated/sky/virgo3b))) // VOREStation Edit: Weird open space N = /turf/simulated/open var/obj/fire/old_fire = fire From 3351edd9162a9a6991e29a7bcfa37528c6d0a080 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 12 Oct 2019 12:21:38 -0400 Subject: [PATCH 02/10] Update turf_changing.dm --- code/game/turfs/turf_changing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 86ce5967c2..7ce93f3077 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -28,7 +28,7 @@ if(N == /turf/space) var/turf/below = GetBelow(src) - if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) || !istype(below, /turf/simulated/sky/virgo3b))) // VOREStation Edit: Weird open space + if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) || !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space N = /turf/simulated/open var/obj/fire/old_fire = fire From 9fbb5c247ebe6654eef129c7419f8ebf7f2d6750 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 13 Oct 2019 16:14:59 -0400 Subject: [PATCH 03/10] Glucose Container --- code/modules/food/glass/bottle_vr.dm | 9 +++++++++ maps/tether/tether-10-colony.dmm | 1 + 2 files changed, 10 insertions(+) diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index e357de97fa..fc1595b699 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -137,3 +137,12 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" prefill = list("unsorbitol" = 60) + +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose + name = "glucose container" + desc = "A container of glucose. Used to treat bloodloss through a hardsuit in unconscious patients." + +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize() + . = ..() + reagents.add_reagent("glucose", 100) + on_reagent_change() diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index b28f538ceb..494b0f48c3 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -418,6 +418,7 @@ /obj/item/weapon/storage/pill_bottle/nutriment, /obj/item/weapon/storage/pill_bottle/iron, /obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 From 715cab9bfba00e9e5d41ec0fa0539de0ce7b397e Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 14 Oct 2019 21:50:07 -0400 Subject: [PATCH 04/10] Update turf_changing.dm --- code/game/turfs/turf_changing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 7ce93f3077..cb3496a96b 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -28,7 +28,7 @@ if(N == /turf/space) var/turf/below = GetBelow(src) - if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) || !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space + if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space N = /turf/simulated/open var/obj/fire/old_fire = fire From f1bd34846bd44e34bdaa0aea977ae2107c4d75ef Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 22:13:27 -0400 Subject: [PATCH 05/10] Properly fixes shadekin phase plummeting --- code/game/objects/effects/step_triggers.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 40c3f752e9..6119138121 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -229,6 +229,10 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop if(isobserver(A)) A.forceMove(T) // Harmlessly move ghosts. return + //VOREStation Edit Start + if(!(A.can_fall())) + return // Phased shifted kin should not fall + //VOREStation Edit End A.forceMove(T) // Living things should probably be logged when they fall... From a4f2053c66668f2b7a63a5a3404c67ae6e742d2c Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 22:34:28 -0400 Subject: [PATCH 06/10] Fixes adminspawned ladders --- code/modules/multiz/structures.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index a13a1457a3..331588183e 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -111,7 +111,7 @@ if(!A.CanPass(M, M.loc, 1.5, 0)) to_chat(M, "\The [A] is blocking \the [src].") return FALSE - return M.Move(T) + return M.forceMove(T) //VOREStation Edit - Fixes adminspawned ladders /obj/structure/ladder/CanPass(obj/mover, turf/source, height, airflow) return airflow || !density From d584369a4a924dd5294484493bd8b776aa63c2d9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 22:38:32 -0400 Subject: [PATCH 07/10] Glucose for military shelter too --- maps/submaps/shelters/shelter_4.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index c5fbcb5007..bed3b074cd 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -95,6 +95,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) "i" = ( From 5072a753e7beaace373e11bdca4f393371e3a072 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 22:48:30 -0400 Subject: [PATCH 08/10] Precise portals --- code/modules/multiz/structures_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index 5d12621ff4..d90f4588b1 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -54,7 +54,7 @@ src.icon_state = "portal1" do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0) else - do_noeffect_teleport(M, target, 1) ///You will appear adjacent to the beacon + do_noeffect_teleport(M, target, 0) ///You will appear on the beacon /obj/structure/portal_gateway name = "portal" From 960b26a63b52c7087b5ec953fb8653650d744f0e Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 23:11:26 -0400 Subject: [PATCH 09/10] Sanity Check --- code/modules/multiz/structures_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index d90f4588b1..207c1c0bc6 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -49,6 +49,9 @@ if (!( target )) qdel(src) return + if (istype(target, /obj/structure/portal_subtle)) + src.icon_state = "portal1" + return if (istype(M, /atom/movable)) if(prob(failchance)) //oh dear a problem, put em in deep space src.icon_state = "portal1" From 2ce617a5f04a740a3f3830aeedc8804cbf0516c3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 14 Oct 2019 23:16:16 -0400 Subject: [PATCH 10/10] Improves Sanity check --- code/modules/multiz/structures_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index 207c1c0bc6..e55b0eae5a 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -50,7 +50,7 @@ qdel(src) return if (istype(target, /obj/structure/portal_subtle)) - src.icon_state = "portal1" + qdel(src) return if (istype(M, /atom/movable)) if(prob(failchance)) //oh dear a problem, put em in deep space