Merge pull request Civ13#2857 from Civ13/revert-2855-working-branch

Revert "Decrease respawn delay on 30 second respawn maps to 0, fix soviet canteens"
Bierkraan · May 20, 2024 · 6d734aa · 6d734aa
2 parents 6c926b3 + d4c3ea3
commit 6d734aa
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 22 deletions.
diff --git a/code/game/objects/map_metadata/african_warlords.dm b/code/game/objects/map_metadata/african_warlords.dm
@@ -4,7 +4,7 @@
 	title = "African Warlords"
 	lobby_icon = 'icons/lobby/africanwarlords.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle,/area/caribbean/no_mans_land/invisible_wall/jungle/one,/area/caribbean/no_mans_land/invisible_wall/jungle/two,/area/caribbean/no_mans_land/invisible_wall/jungle/three)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner ="No warband has won yet."
 	faction_organization = list(INDIANS, CIVILIAN)
 	grace_wall_timer = 1200

diff --git a/code/game/objects/map_metadata/alleyway.dm b/code/game/objects/map_metadata/alleyway.dm
@@ -3,7 +3,7 @@
 	title = "Alleyway"
 	lobby_icon = 'icons/lobby/alleyway.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle, /area/caribbean/no_mans_land/invisible_wall/inside, /area/caribbean/no_mans_land/invisible_wall/inside/one, /area/caribbean/no_mans_land/invisible_wall/inside/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner ="The fighting for the street is still going on."
 	faction_organization = list(
 		JAPANESE,)

diff --git a/code/game/objects/map_metadata/clash.dm b/code/game/objects/map_metadata/clash.dm
@@ -5,7 +5,7 @@
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
 	victory_time = 21600
 	no_winner = "The settlement is still held by the Raven Clan."
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 	faction_organization = list(
 		NORWEGIAN,

diff --git a/code/game/objects/map_metadata/compound.dm b/code/game/objects/map_metadata/compound.dm
@@ -4,7 +4,7 @@
 	title = "Compound"
 	lobby_icon = 'icons/lobby/vietnam.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner ="No base has been captured."
 
 

diff --git a/code/game/objects/map_metadata/fields.dm b/code/game/objects/map_metadata/fields.dm
@@ -3,7 +3,7 @@
 	title = "Fields"
 	lobby_icon = 'icons/lobby/imperial.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/forest.dm b/code/game/objects/map_metadata/forest.dm
@@ -4,7 +4,7 @@
 	lobby_icon = 'icons/lobby/ww2.png'
 	no_winner ="The battle for the city is still going on."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/not_dynamic, /area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	faction_organization = list(
 		GERMAN,
 		RUSSIAN,

diff --git a/code/game/objects/map_metadata/heraclea.dm b/code/game/objects/map_metadata/heraclea.dm
@@ -3,7 +3,7 @@
 	title = "Heraclea"
 	lobby_icon = 'icons/lobby/ancient.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/hue.dm b/code/game/objects/map_metadata/hue.dm
@@ -3,7 +3,7 @@
 	title = "Hue"
 	lobby_icon = 'icons/lobby/vietnam.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner = "No base has been captured."
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/karak.dm b/code/game/objects/map_metadata/karak.dm
@@ -5,7 +5,7 @@
 	lobby_icon = 'icons/lobby/medieval.png'
 	no_winner ="The fighting is still going on."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 	faction_organization = list(
 		FRENCH,

diff --git a/code/game/objects/map_metadata/naval.dm b/code/game/objects/map_metadata/naval.dm
@@ -5,7 +5,7 @@
 	lobby_icon = 'icons/lobby/imperial.png'
 	no_winner ="No ship has been captured."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/road_to_dak_to.dm b/code/game/objects/map_metadata/road_to_dak_to.dm
@@ -4,7 +4,7 @@
 	title = "Road to Dak To"
 	lobby_icon = 'icons/lobby/vietnam.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle,/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two,/area/caribbean/no_mans_land/invisible_wall/inside)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/sammirhayeed.dm b/code/game/objects/map_metadata/sammirhayeed.dm
@@ -3,7 +3,7 @@
 	title = "Sammir Hayeed"
 	lobby_icon = 'icons/lobby/medieval.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 	faction_organization = list(
 		ARAB,

diff --git a/code/game/objects/map_metadata/santo_tomas.dm b/code/game/objects/map_metadata/santo_tomas.dm
@@ -3,7 +3,7 @@
 	title = "Santo Tomas"
 	lobby_icon = 'icons/lobby/ph_us_war.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/sekigahara.dm b/code/game/objects/map_metadata/sekigahara.dm
@@ -3,7 +3,7 @@
 	title = "Sekigahara"
 	lobby_icon = 'icons/lobby/medieval.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner ="The fighting for sekigahara is still going on."
 	faction_organization = list(
 		JAPANESE,)

diff --git a/code/game/objects/map_metadata/siege.dm b/code/game/objects/map_metadata/siege.dm
@@ -4,7 +4,7 @@
 	title = "Siege"
 	lobby_icon = 'icons/lobby/ancient.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 	faction_organization = list(
 		ROMAN,

diff --git a/code/game/objects/map_metadata/stalingrad.dm b/code/game/objects/map_metadata/stalingrad.dm
@@ -5,7 +5,7 @@
 	lobby_icon = 'icons/lobby/stalingrad.png'
 	no_winner = "The battle for the city is still going on."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/taiga,/area/caribbean/no_mans_land/invisible_wall/taiga/one,/area/caribbean/no_mans_land/invisible_wall/taiga/two)
-	respawn_delay = 0
+	respawn_delay = 600 // 1 minute
 
 	faction_organization = list(
 		GERMAN,

diff --git a/code/game/objects/map_metadata/tadojsville.dm b/code/game/objects/map_metadata/tadojsville.dm
@@ -3,7 +3,7 @@
 	title = "Tadojsville Siege"
 	lobby_icon = 'icons/lobby/tadojsville.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/jungle,/area/caribbean/no_mans_land/invisible_wall/jungle/one)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_winner ="No warband has captured the clinic yet."
 	no_hardcore = TRUE
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/teutoburg.dm b/code/game/objects/map_metadata/teutoburg.dm
@@ -3,7 +3,7 @@
 	title = "Teutoburg"
 	lobby_icon = 'icons/lobby/ancient.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/verdun.dm b/code/game/objects/map_metadata/verdun.dm
@@ -4,7 +4,7 @@
 	title = "Battle of Verdun"
 	lobby_icon = 'icons/lobby/ww1.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/one)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/whiterun.dm b/code/game/objects/map_metadata/whiterun.dm
@@ -5,7 +5,7 @@
 	lobby_icon = 'icons/lobby/tes13.png'
 	no_winner ="The fighting is still going on."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall)
-	respawn_delay = 0
+	respawn_delay = 300
 	no_hardcore = TRUE
 	force_mapgen = TRUE
 	faction_organization = list(

diff --git a/code/game/objects/map_metadata/ypres.dm b/code/game/objects/map_metadata/ypres.dm
@@ -4,7 +4,7 @@
 	title = "2nd Battle of Ypres"
 	lobby_icon = 'icons/lobby/ww1.png'
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
-	respawn_delay = 0
+	respawn_delay = 300
 
 	faction_organization = list(
 		BRITISH,

diff --git a/code/modules/reagents/reagent_containers/food/drinks/canteen.dm b/code/modules/reagents/reagent_containers/food/drinks/canteen.dm
@@ -64,4 +64,4 @@
 	desc = "A very large canteen for storing water."
 /obj/item/weapon/reagent_containers/food/drinks/bottle/canteen/ww2/rus/New()
 	..()
-	reagents.add_reagent("water", 200)
+	reagents.add_reagent("water", 200)
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi