From 4dd67d35e41634ef944fa2fac29bb145b8b55bed Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:00:55 -0400 Subject: [PATCH 1/7] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 95534aaef9..557265852f 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -53162,7 +53162,7 @@ pixel_x = 3; pixel_y = 3 }, -/turf/open/water, +/turf/open/water/jungle, /area/hallway/secondary/entry) "daY" = ( /obj/structure/disposalpipe/segment, @@ -57666,7 +57666,7 @@ /turf/open/space/basic, /area/space/nearstation) "mJR" = ( -/turf/open/water, +/turf/open/water/jungle, /area/hallway/secondary/entry) "mKc" = ( /obj/structure/bookcase/random/nonfiction, @@ -58374,7 +58374,7 @@ pixel_x = -2; pixel_y = 13 }, -/turf/open/water, +/turf/open/water/jungle, /area/hallway/secondary/entry) "ous" = ( /obj/effect/turf_decal/stripes/line, @@ -59683,7 +59683,7 @@ pixel_x = -60; pixel_y = -60 }, -/turf/open/water, +/turf/open/water/jungle, /area/hallway/secondary/entry) "qVk" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, @@ -61176,7 +61176,7 @@ /area/hallway/secondary/entry) "upX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/water, +/turf/open/water/jungle, /area/hallway/secondary/entry) "uqJ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -62332,7 +62332,11 @@ pixel_x = -15; pixel_y = -4 }, -/turf/open/water, +/obj/structure/flora/junglebush/large{ + pixel_x = -15; + pixel_y = -4 + }, +/turf/open/water/jungle, /area/hallway/secondary/entry) "wTD" = ( /obj/structure/table/wood, From 4eb8b2701dbba36bcc15b681213cf29161a614d6 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:10:28 -0400 Subject: [PATCH 2/7] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 557265852f..f5afd3707d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -62332,10 +62332,7 @@ pixel_x = -15; pixel_y = -4 }, -/obj/structure/flora/junglebush/large{ - pixel_x = -15; - pixel_y = -4 - }, +/obj/structure/flora/rock/pile, /turf/open/water/jungle, /area/hallway/secondary/entry) "wTD" = ( From 52659ffe53a53aa6fb5752d368a1cbe5f5633247 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:38:36 -0400 Subject: [PATCH 3/7] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index f5afd3707d..853980f7b9 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -53162,7 +53162,9 @@ pixel_x = 3; pixel_y = 3 }, -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "daY" = ( /obj/structure/disposalpipe/segment, @@ -57666,7 +57668,9 @@ /turf/open/space/basic, /area/space/nearstation) "mJR" = ( -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "mKc" = ( /obj/structure/bookcase/random/nonfiction, @@ -58374,7 +58378,9 @@ pixel_x = -2; pixel_y = 13 }, -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "ous" = ( /obj/effect/turf_decal/stripes/line, @@ -59683,7 +59689,9 @@ pixel_x = -60; pixel_y = -60 }, -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "qVk" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, @@ -61176,7 +61184,9 @@ /area/hallway/secondary/entry) "upX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "uqJ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -62333,7 +62343,9 @@ pixel_y = -4 }, /obj/structure/flora/rock/pile, -/turf/open/water/jungle, +/turf/open/water{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, /area/hallway/secondary/entry) "wTD" = ( /obj/structure/table/wood, From b682d886e90bf78cb9386b41d03948b16b8eb591 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:44:15 -0400 Subject: [PATCH 4/7] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 853980f7b9..dac5df477d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -53163,7 +53163,8 @@ pixel_y = 3 }, /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "daY" = ( @@ -57669,7 +57670,8 @@ /area/space/nearstation) "mJR" = ( /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "mKc" = ( @@ -58379,7 +58381,8 @@ pixel_y = 13 }, /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "ous" = ( @@ -59690,7 +59693,8 @@ pixel_y = -60 }, /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "qVk" = ( @@ -61185,7 +61189,8 @@ "upX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "uqJ" = ( @@ -62344,7 +62349,8 @@ }, /obj/structure/flora/rock/pile, /turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS; + planetary_atmos = 0 }, /area/hallway/secondary/entry) "wTD" = ( From 7d7525825de606d26f833469baea5e20f8a32dd2 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:51:57 -0400 Subject: [PATCH 5/7] deco waterrrr --- _maps/map_files/PubbyStation/PubbyStation.dmm | 30 ++++--------------- code/game/turfs/simulated/water.dm | 17 +++++++++++ tgstation.dme | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index dac5df477d..0972252bf6 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -53162,10 +53162,7 @@ pixel_x = 3; pixel_y = 3 }, -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "daY" = ( /obj/structure/disposalpipe/segment, @@ -57669,10 +57666,7 @@ /turf/open/space/basic, /area/space/nearstation) "mJR" = ( -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "mKc" = ( /obj/structure/bookcase/random/nonfiction, @@ -58380,10 +58374,7 @@ pixel_x = -2; pixel_y = 13 }, -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "ous" = ( /obj/effect/turf_decal/stripes/line, @@ -59692,10 +59683,7 @@ pixel_x = -60; pixel_y = -60 }, -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "qVk" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, @@ -61188,10 +61176,7 @@ /area/hallway/secondary/entry) "upX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "uqJ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -62348,10 +62333,7 @@ pixel_y = -4 }, /obj/structure/flora/rock/pile, -/turf/open/water{ - initial_gas_mix = OPENTURF_DEFAULT_ATMOS; - planetary_atmos = 0 - }, +/turf/open/water/decorative, /area/hallway/secondary/entry) "wTD" = ( /obj/structure/table/wood, diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index 708ca230b1..a72d837495 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -15,3 +15,20 @@ barefootstep = FOOTSTEP_WATER clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER + +/turf/open/water/decorative + gender = PLURAL + name = "water" + desc = "Shallow water." + icon = 'icons/turf/floors.dmi' + icon_state = "riverwater_motion" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + slowdown = 1 + bullet_sizzle = TRUE + bullet_bounce_sound = null //needs a splashing sound one day. + + footstep = FOOTSTEP_WATER + barefootstep = FOOTSTEP_WATER + clawfootstep = FOOTSTEP_WATER + heavyfootstep = FOOTSTEP_WATER \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 298443fd4e..4ffe7a19af 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3621,6 +3621,7 @@ #include "code\modules\vehicles\atv.dm" #include "code\modules\vehicles\bicycle.dm" #include "code\modules\vehicles\lavaboat.dm" +#include "code\modules\vehicles\motorized_wheelchair.dm" #include "code\modules\vehicles\pimpin_ride.dm" #include "code\modules\vehicles\ridden.dm" #include "code\modules\vehicles\scooter.dm" @@ -3632,7 +3633,6 @@ #include "code\modules\vehicles\wheelchair.dm" #include "code\modules\vehicles\cars\car.dm" #include "code\modules\vehicles\cars\clowncar.dm" -#include "code\modules\vehicles\motorized_wheelchair.dm" #include "code\modules\vending\_vending.dm" #include "code\modules\vending\assist.dm" #include "code\modules\vending\autodrobe.dm" From 652ffe22a25678b2e28b639ceca489fd787e5b48 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 30 Jul 2021 23:58:11 -0400 Subject: [PATCH 6/7] Update water.dm --- code/game/turfs/simulated/water.dm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index a72d837495..6ff4353747 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -17,18 +17,5 @@ heavyfootstep = FOOTSTEP_WATER /turf/open/water/decorative - gender = PLURAL - name = "water" - desc = "Shallow water." - icon = 'icons/turf/floors.dmi' - icon_state = "riverwater_motion" initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE - slowdown = 1 - bullet_sizzle = TRUE - bullet_bounce_sound = null //needs a splashing sound one day. - - footstep = FOOTSTEP_WATER - barefootstep = FOOTSTEP_WATER - clawfootstep = FOOTSTEP_WATER - heavyfootstep = FOOTSTEP_WATER \ No newline at end of file + planetary_atmos = FALSE \ No newline at end of file From dfff5339c9d0c3983e2c07f0ece7c03498439afa Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sat, 31 Jul 2021 00:23:09 -0400 Subject: [PATCH 7/7] Update water.dm --- code/game/turfs/simulated/water.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index 6ff4353747..72612f82ff 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -18,4 +18,4 @@ /turf/open/water/decorative initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE \ No newline at end of file + planetary_atmos = FALSE